| commit | 85bfc94ffbc249e68dcf0fa8c23fd32f8611fe9b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 18 16:37:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 16:37:30 2014 +0000 |
| tree | 11c910d42d5c37a29f1ae5c43e4df7c104cddb04 | |
| parent | a80fca2ec352adcc643a13d3fb0f475e190f270e [diff] | |
| parent | 42c645e803555d70073a0eddec3d1fb477f0daa0 [diff] |
am 42c645e8: (-s ours) am 32b2735a: (-s ours) am ab474588: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '42c645e803555d70073a0eddec3d1fb477f0daa0': Import translations. DO NOT MERGE