commit | 8c79f6334e543348bbdfecadb6f3d3d767461894 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 29 07:00:51 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:00:51 2014 +0000 |
tree | db35656d6647ad8866ef058d32a8b681a4c07d6b | |
parent | d3c975a0b9bdecb2b5a16a89218e55c2fb38bb9b [diff] | |
parent | 3abde08f793d2b95e0c4a71521091c99f1384b2d [diff] |
am 3abde08f: (-s ours) am f02cea2e: (-s ours) Import translations. DO NOT MERGE * commit '3abde08f793d2b95e0c4a71521091c99f1384b2d':