commit | 81a419478548063ef5245c377ad4a7549108049f | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Sep 17 05:09:17 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 05:09:17 2014 +0000 |
tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
parent | bef441a0ae5f6932be945ef3b87862ec84af3cf6 [diff] | |
parent | d4ce00d1594089f34adcfdbd2280f3c5e0557627 [diff] |
am d4ce00d1: (-s ours) am d14ce20c: (-s ours) am 64334e4f: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd4ce00d1594089f34adcfdbd2280f3c5e0557627': Import translations. DO NOT MERGE