| commit | d0818369645b6bccfd396b04399df3aca062e6c8 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Aug 25 22:23:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 25 22:23:57 2014 +0000 |
| tree | 13ee4d2fe9b60bad7536952b9de59a0571a55db2 | |
| parent | 92ef7bc902c72060823fd8da53c718f7f8d0b66d [diff] | |
| parent | 5a292604eb2b85e6418918e131b50e73d76c5e6a [diff] |
am 6f60ce4e: (-s ours) am 7fbc5ae8: (-s ours) am 2be95a8b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '6f60ce4ee061cb07fbee74da9ed13ec48cfb9cc9': Import translations. DO NOT MERGE