tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 7bfcb956ced721c611b8a441fedf3026b9366481
parent 86759f2d41255195e5155af2b8438bde70cd25a0
author Baligh Uddin <baligh@google.com> 1392410971 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410971 +0000

am 86759f2d: (-s ours) am 0ed8331d: (-s ours) am 4c38d175: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '86759f2d41255195e5155af2b8438bde70cd25a0':
  Import translations. DO NOT MERGE