tree 10da860fcff71886af91d082e31f0e1917926848
parent 574420955a4ee802d6573db413f77d217c06c020
parent 4f326dd0c4cf19c946a738303fb26d8cdd08330b
author Baligh Uddin <baligh@google.com> 1414566287 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566287 +0000

am 4f326dd0: (-s ours) am 7e638c72: (-s ours) am 34df5a5b: (-s ours) am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '4f326dd0c4cf19c946a738303fb26d8cdd08330b':