tree 10da860fcff71886af91d082e31f0e1917926848
parent bc878970d2aece929f4999d58be57f3f1524789d
parent c393f3dd393b73639b59c874f94086e21cb476c1
author Baligh Uddin <baligh@google.com> 1414566331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566331 +0000

am c393f3dd: (-s ours) am 88485bb5: (-s ours) am 78c7429c: (-s ours) am 0cc0c216: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit 'c393f3dd393b73639b59c874f94086e21cb476c1':