commit | 785ca6bb42594fff4d8d9d45c8f08e736f5733c1 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:50:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:50:00 2014 +0000 |
tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
parent | c4df99290994fa40acc56a8ff46d351f95cd5abe [diff] | |
parent | fd855986099c00c50bf62c2cd69796a9066d774d [diff] |
am fd855986: (-s ours) am baa58811: (-s ours) am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit 'fd855986099c00c50bf62c2cd69796a9066d774d':