tree 341b25f53ce8db5f06ec2fc6f07436707eabf79b
parent ed6a0ca2f1547a6d1a6a334af1399eaa56c40c1c
parent fcbe9bb22aab07a130e0d74084c464827d6aa5ef
author Baligh Uddin <baligh@google.com> 1414388304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414388304 +0000

am fcbe9bb2: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE

* commit 'fcbe9bb22aab07a130e0d74084c464827d6aa5ef':