commit | 522ec48316a9efc36172fd68123b0807cd482ad1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 16:50:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 16:50:46 2014 +0000 |
tree | 3d9832ebe642aff4c9f9e7507990aadc668bb538 | |
parent | 17f97b2045c9801d8d8c123b6df2695b7d57d66a [diff] | |
parent | a2b29d5f9bda8a0019f57a737d06a7a24814c3bc [diff] |
am a2b29d5f: (-s ours) am 58965944: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a2b29d5f9bda8a0019f57a737d06a7a24814c3bc': Import translations. DO NOT MERGE