tree cba62d0d64153aa2169651696bc238591341d679
parent 4f326dd0c4cf19c946a738303fb26d8cdd08330b
parent 0b866e599f31ea5291cae30c81e9df53a06ca1cf
author Baligh Uddin <baligh@google.com> 1414085363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085363 +0000

am 0b866e59: (-s ours) am 20dcb55c: (-s ours) am 9a646bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '0b866e599f31ea5291cae30c81e9df53a06ca1cf':