commit | 0a23ca9c06235e17d706a7bebc6c7de5422210f7 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:30:32 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:30:32 2014 +0000 |
tree | cba62d0d64153aa2169651696bc238591341d679 | |
parent | f07c840bc173b4a0913bbb2a034749bbc03ddd3a [diff] | |
parent | f0f0326e3fd95d58c7ad9012ac530b944cd8056f [diff] |
am f0f0326e: (-s ours) am bf78f00a: (-s ours) am aa61fd71: (-s ours) am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit 'f0f0326e3fd95d58c7ad9012ac530b944cd8056f':