commit | 98e5bd3c3f94a159e8c5da8eb5b3bd086f6c4d8d | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:51:22 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:51:22 2014 +0000 |
tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
parent | 6374f2a84e4057fca7704f4f4abb987878860e6e [diff] | |
parent | d46f31f60cc502c1403fa8210861294b10fe2994 [diff] |
am d46f31f6: (-s ours) am eb7ed429: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'd46f31f60cc502c1403fa8210861294b10fe2994': Import translations. DO NOT MERGE