commit | b2f42f36e628314f45465865a2d6e416c5c0498e | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 09 12:31:53 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 12:31:53 2013 -0700 |
tree | 2819d0df63ebb34bd29d50d1fb81fc77d9581d47 | |
parent | 018fe23455732404193697529459b507a6f739a2 [diff] | |
parent | 0fedffaeeccef2e0c438a6622011c2308c4bdc03 [diff] |
am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE * commit 'f351b6c0095a449f72342e88ecd88c18abb414c5':