| commit | 5382925fa1b209315395874b0cf5027e43f70235 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:50:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:50:39 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | 67a5fdcd1fa54bd5a6b162e824f0bb42244cf286 [diff] | |
| parent | 5b120dfd3a72e9974fa7fefa3d67ffc7aec39aa3 [diff] |
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 '5b120dfd3a72e9974fa7fefa3d67ffc7aec39aa3':