| commit | d26c6b10ff1648fc4f1f023b848efd52b4265d2b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:58:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:16 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | fd6b2e4f16f7a2fbcd40fcbf36d38906394e0055 [diff] | |
| parent | b2ad3df7e0e80d589ffaba72330e31585f940252 [diff] |
am b2ad3df7: (-s ours) am 192725b0: (-s ours) am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit 'b2ad3df7e0e80d589ffaba72330e31585f940252':