| commit | 9b0ae11dc87d93a523ac6c18f8c0aed38bddd102 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 17:17:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 17:17:18 2014 +0000 |
| tree | 35fe6b8133e0bb525364e085a6b3b5d54a02acec | |
| parent | 2a0abe1824f8c48afa88516bee30c30d0a0f8fda [diff] | |
| parent | 8262c348e9e0465f048db22f02d047f494983431 [diff] |
am 8262c348: (-s ours) am f89add8d: (-s ours) am d5937725: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '8262c348e9e0465f048db22f02d047f494983431': Import translations. DO NOT MERGE