| commit | 1c74e20db1c59fdb4e9512339c1251830842c905 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Jun 20 19:48:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 19:48:52 2014 +0000 |
| tree | d8e26341e29e39606e1a30ea9d25febfbd192ffd | |
| parent | 149c1b09ee683b1af90a9f21488ded197e31ffa7 [diff] | |
| parent | 1b3a52170ab0f2ec82532a689d271eaf8b8997f9 [diff] |
am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '1b3a52170ab0f2ec82532a689d271eaf8b8997f9': Import translations. DO NOT MERGE