| commit | f004fcdaace3015b8f55c170dc50a1d50c238a15 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu May 01 16:31:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 01 16:31:29 2014 +0000 |
| tree | 4c775c405cd5cf3996ef9567ad82e412818ea940 | |
| parent | 1d78bc25b94c0ed56f13eb115e8d3ea594f259bb [diff] | |
| parent | 8aa9792fa6b1d09e63c99bdd8f83e16a419aefb7 [diff] |
am 81814fef: (-s ours) am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '81814fefc3e0fdb5ab1d96186c53e146ed1f1d56': Import translations. DO NOT MERGE