commit | fb914562e4a1fc81fab90e574c9fd4a677b1e513 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:28:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:28:12 2014 +0000 |
tree | cba62d0d64153aa2169651696bc238591341d679 | |
parent | 069a695e6b0170edcc7848c78fe4f726bcf935a6 [diff] | |
parent | 348df67e4ea1dcfb3c41b5729b7187660ad7324d [diff] |
am 348df67e: (-s ours) am 542cf02d: (-s ours) am 93e416b2: (-s ours) am fb291f5a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit '348df67e4ea1dcfb3c41b5729b7187660ad7324d':