| commit | d4ce00d1594089f34adcfdbd2280f3c5e0557627 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:17:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:17:22 2014 +0000 |
| tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
| parent | eed907c2c6abef6f89f518858c082ffaa48a366a [diff] | |
| parent | d14ce20c77a81f3ad1cb32e333fa480930819a93 [diff] |
am d14ce20c: (-s ours) am 64334e4f: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd14ce20c77a81f3ad1cb32e333fa480930819a93': Import translations. DO NOT MERGE