tree cba62d0d64153aa2169651696bc238591341d679
parent 1e8f0351a4e62ce72e25640ffc32adcd137c48a8
parent 88485bb5d086e66248fed3246681703860c16a8f
author Baligh Uddin <baligh@google.com> 1414085450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085450 +0000

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

* commit '88485bb5d086e66248fed3246681703860c16a8f':