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