tree 10da860fcff71886af91d082e31f0e1917926848
parent 22f948a1e57d892aed9df8605bd6a211d993605c
parent 42c2f63aa68eeae9e98a0a8f39f4891a2193b1fa
author Baligh Uddin <baligh@google.com> 1414566076 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566076 +0000

am 42c2f63a: (-s ours) am 7bfcb956: (-s ours) am ecad1b10: (-s ours) am a5b43767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '42c2f63aa68eeae9e98a0a8f39f4891a2193b1fa':