| commit | d25f598972e19beb8f0529bcebe1c97143c1c6a4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 07:08:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:08:12 2014 +0000 |
| tree | e3b45e81753a9086747f9ae350b2ae0ba3ef2285 | |
| parent | 01f07a87a96ae7053e274d806d20ac48952a58e0 [diff] | |
| parent | ac26025fe262b3a95bcee9719708ba04b560fd49 [diff] |
am ac26025f: (-s ours) am 08ca5d2e: (-s ours) am 522ec483: (-s ours) am a2b29d5f: (-s ours) am 58965944: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ac26025fe262b3a95bcee9719708ba04b560fd49':