| commit | 58b89d0c8ad47540c8f1989489f9c5115db36f09 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Mar 20 23:12:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:26 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 8638481320f0d290e9d59e80ef76d4c401c3ce74 [diff] | |
| parent | b5c73cb52dac5ebc576acb2aff95c1f961f78954 [diff] |
am b5c73cb5: (-s ours) am c401c683: (-s ours) am 04f7179d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'b5c73cb52dac5ebc576acb2aff95c1f961f78954':