| commit | 9eeffa8f91f15446ee6b54496b95f79cdb50ded4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:30:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:30:51 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | c393f3dd393b73639b59c874f94086e21cb476c1 [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':