| commit | 4adcb01928305bee63ff82b358e42b42f5045d25 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:59:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:59:14 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | c303f510d6837f2959d2b555339ee5b0e2928eaa [diff] | |
| parent | 62afccafaa29519ef90671b70ce6c174107b782d [diff] |
am 62afccaf: (-s ours) 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 '62afccafaa29519ef90671b70ce6c174107b782d':