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