commit | 074bb8d8002c9e13c5e8da9623b75867fe9d91d8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:02:09 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:02:09 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | 9b8e25b60f5e12ce09e3816c448abdc97da6cdad [diff] | |
parent | 4d34d6e8847cf0fb9b1d30b4f06d3c9e86c6a09e [diff] |
am 4d34d6e8: (-s ours) am 5382925f: (-s ours) am 5b120dfd: (-s ours) am 788475e9: (-s ours) am 7881f431: (-s ours) am e0916aec: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit '4d34d6e8847cf0fb9b1d30b4f06d3c9e86c6a09e':