| commit | 8aa9792fa6b1d09e63c99bdd8f83e16a419aefb7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu May 01 16:25:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 01 16:25:29 2014 +0000 |
| tree | f10a135ce183818e05c8050a16bfd4f6b3e92af9 | |
| parent | 100f42e6a561f38ec7ef829ffcec26b9df865e1a [diff] | |
| parent | 545444f63f7d944945c80e1b254264a20fe5af43 [diff] |
am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '1ffec559d04618fbd31eaf972a81c6df324965c1': Import translations. DO NOT MERGE