| commit | bf29cbbc1df534dcf2f8553c70920b7cc056e76c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 26 23:50:23 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 26 23:50:23 2013 +0000 |
| tree | cdf5365dcb27ee831323c80daa80d6e0225b14a3 | |
| parent | 7aa47b52702d5be6b1644f4a6fe406e02c0cf5b8 [diff] | |
| parent | 28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed [diff] |
am 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed': Import translations. DO NOT MERGE