tree cba62d0d64153aa2169651696bc238591341d679
parent 42c2f63aa68eeae9e98a0a8f39f4891a2193b1fa
parent faf16c70c844b41106601a6e95d3ee1b129758f7
author Baligh Uddin <baligh@google.com> 1414085130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085130 +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':