| commit | bf825a4502a42a43c2497f426b8cc6dcaf29d12a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:19:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:19:58 2014 +0000 |
| tree | c5581aeefcf428301570147204faed4d3c535b5e | |
| parent | 79187ef1d88c11561dc41bf1024e7eba01266285 [diff] | |
| parent | 054b5bbb2bd8d09dde5ce8f5a3335fde446e92fa [diff] |
am f059e734: (-s ours) am 00392713: (-s ours) am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'f059e73408fa0458a971bdf92f16b2858da1492e': Import translations. DO NOT MERGE