| commit | 61c42768d1d54fa029f886f7a06372b63a8e6ba9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 17 05:09:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 05:09:13 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | 6bd8103b5925a09872153a935982f896dba457ad [diff] | |
| parent | a19636711378e15436bf83f381ae811f778caf25 [diff] |
am a1963671: (-s ours) am 82dd4420: (-s ours) am 64b61028: (-s ours) am 771a3a7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a19636711378e15436bf83f381ae811f778caf25': Import translations. DO NOT MERGE