| commit | b82ecf80aa3817d6b16b3818f5007e77e5161ec5 | [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 | 7cb2fb48abb6e5cb6ca47e65aa73315aa5da9123 [diff] | |
| parent | e1d65e0e88ae8de6271bfef30e942d56ba0418e8 [diff] |
am e1d65e0e: (-s ours) am 82c09c82: (-s ours) am ab3f2492: (-s ours) am 1bc53e63: (-s ours) am e7a64624: (-s ours) am adff3f1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e1d65e0e88ae8de6271bfef30e942d56ba0418e8':