| commit | 5b120dfd3a72e9974fa7fefa3d67ffc7aec39aa3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:35:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:35:49 2014 +0000 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | 80da5e82cfebdf6217da953303e196bfc3fef915 [diff] | |
| parent | 788475e94dc8236edc89376274acea93036f3a31 [diff] |
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 '788475e94dc8236edc89376274acea93036f3a31':