tree 10da860fcff71886af91d082e31f0e1917926848
parent f49baea5099606d314d66233291f10a8727c183f
parent 7a50fdff44faba488190cabaa3b907111b31bb06
author Baligh Uddin <baligh@google.com> 1414566108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566108 +0000

am 7a50fdff: (-s ours) am ef69114f: (-s ours) am 738ad8f5: (-s ours) am 88b88fc5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '7a50fdff44faba488190cabaa3b907111b31bb06':