tree 2847949f8bc9111a84704c12bd64ebc1ee2ced97
parent 76fffaeaa2963b9cd777f49ce297ef1d0760cd15
parent 65301b1443804099de1e5165d98a0506682df5cb
author Baligh Uddin <baligh@google.com> 1392411284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411284 +0000

am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '65301b1443804099de1e5165d98a0506682df5cb':
  Import translations. DO NOT MERGE