commit | 1ca1e4e4d585c2aa09436ff2ec9ea07c8b3e4723 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:50:54 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:50:54 2014 +0000 |
tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
parent | 47eed63dcef5d3f60a3be617a5a4d07de139e808 [diff] | |
parent | a371f3ebabc175c47f240b9795eaf7fc2ceb926c [diff] |
am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'a371f3ebabc175c47f240b9795eaf7fc2ceb926c': Import translations. DO NOT MERGE