| commit | 6b195a16354441f6299598d7929724ad2b69d887 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 21:01:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 21:01:03 2014 +0000 |
| tree | 4f17d9329b6dccf2976cd81880c5fed07819af43 | |
| parent | 054ed1e1811c305c58ebc94d0d5b9e3dbb232569 [diff] | |
| parent | 7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32 [diff] |
am 7c3fe394: (-s ours) am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf * commit '7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32': Import translations. DO NOT MERGE