| commit | b2ad3df7e0e80d589ffaba72330e31585f940252 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:49:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:49:32 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | faf16c70c844b41106601a6e95d3ee1b129758f7 [diff] | |
| parent | 192725b00598fb919e9413a2a6b2a258373cbedc [diff] |
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 '192725b00598fb919e9413a2a6b2a258373cbedc':