| commit | 267bdfd0a669088fd00b68ef9452501575ea53e4 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:58:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:35 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | 5e54c18e32f18088d6cd069cf74ca20aa3545067 [diff] | |
| parent | 785ca6bb42594fff4d8d9d45c8f08e736f5733c1 [diff] |
am 785ca6bb: (-s ours) 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 '785ca6bb42594fff4d8d9d45c8f08e736f5733c1':