| commit | da5d918599441fe2486ac50e72fc68763e915889 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:05:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:05:33 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | ed5dee9d2cd78e4f290e274cff68958194d1f4d1 [diff] | |
| parent | 9eeffa8f91f15446ee6b54496b95f79cdb50ded4 [diff] |
am 9eeffa8f: (-s ours) 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 '9eeffa8f91f15446ee6b54496b95f79cdb50ded4':