| commit | 62afccafaa29519ef90671b70ce6c174107b782d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:51:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:51:23 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | 348df67e4ea1dcfb3c41b5729b7187660ad7324d [diff] | |
| parent | 5c49a8dff24feab476d2c379fbb7e521f2996c8c [diff] |
am 5c49a8df: (-s ours) am 4776bdf4: (-s ours) am c4a95d3c: (-s ours) am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit '5c49a8dff24feab476d2c379fbb7e521f2996c8c':