commit | 44c67df145104cb0f6e706e4603408b62ccb6070 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Aug 15 16:02:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 16:02:35 2014 +0000 |
tree | bf1db7e017725385a34d0adf74e52e6d6d525907 | |
parent | 36f3ba6db00a5cc741759e6e97571c10bfcb4cee [diff] | |
parent | 4ebfec72abf42dfa6f6e33b956bce6b9afa2c6dc [diff] |
am 4ebfec72: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4ebfec72abf42dfa6f6e33b956bce6b9afa2c6dc': Import translations. DO NOT MERGE