| commit | f3715e4548f8a4f4e461bb24e131757d47f5c101 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 17 05:09:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 05:09:10 2014 +0000 |
| tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
| parent | 066faf03920d69038cd725936586dac84da0071a [diff] | |
| parent | 2a0abe1824f8c48afa88516bee30c30d0a0f8fda [diff] |
am 2a0abe18: (-s ours) am 11eedd38: (-s ours) am 9dd95f2b: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2a0abe1824f8c48afa88516bee30c30d0a0f8fda': Import translations. DO NOT MERGE