| commit | 7cb2fb48abb6e5cb6ca47e65aa73315aa5da9123 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 13 23:49:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:49:04 2014 +0000 |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 | |
| parent | 4ea0f54da034efb148e174381efdcc4762633a5f [diff] | |
| parent | 2a59dedb657db3831a55f67903cf7c446b7f5b1e [diff] |
am 2a59dedb: (-s ours) am f9fba9fd: (-s ours) am 6e9c3763: (-s ours) am 3e9fac90: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '2a59dedb657db3831a55f67903cf7c446b7f5b1e':