| commit | 2a0abe1824f8c48afa88516bee30c30d0a0f8fda | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:17:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:17:16 2014 +0000 |
| tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
| parent | 6111d263069d2fa3941c165eb0b1de22b68f6177 [diff] | |
| parent | 11eedd383e5705649638ae615fc56cfbbac956ba [diff] |
am 11eedd38: (-s ours) am 9dd95f2b: (-s ours) am 73cbb981: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '11eedd383e5705649638ae615fc56cfbbac956ba': Import translations. DO NOT MERGE