| commit | 79187ef1d88c11561dc41bf1024e7eba01266285 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Aug 16 04:19:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 16 04:19:53 2014 +0000 |
| tree | c5581aeefcf428301570147204faed4d3c535b5e | |
| parent | d0e9db59d732ec83ac21d72abe24f41f978eb833 [diff] | |
| parent | eae61b82bdfd49ac09146b6069596ea5c864c3e0 [diff] |
am de8ffd03: (-s ours) am 5b634929: (-s ours) am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'de8ffd0364b82a6f8449f98e71fe38d7b902c331': Import translations. DO NOT MERGE