tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 9e5bfe3321876bd580a20483fb50d13adeee35fa
parent faf16c70c844b41106601a6e95d3ee1b129758f7
author Baligh Uddin <baligh@google.com> 1392411496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411496 +0000

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

* commit 'faf16c70c844b41106601a6e95d3ee1b129758f7':
  Import translations. DO NOT MERGE