commit | e201854185b2b600d479e0357f10747c33e1734f | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:25:31 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:25:31 2014 +0000 |
tree | cba62d0d64153aa2169651696bc238591341d679 | |
parent | cea98f1ab06f24bde00e2fa24f9dbd51ce16eac0 [diff] | |
parent | b2ad3df7e0e80d589ffaba72330e31585f940252 [diff] |
am b2ad3df7: (-s ours) am 192725b0: (-s ours) am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit 'b2ad3df7e0e80d589ffaba72330e31585f940252':