tree cba62d0d64153aa2169651696bc238591341d679
parent 15b2c6e1505445901585ef6e8f39b3f56fbc3a9a
parent 5382925fa1b209315395874b0cf5027e43f70235
author Baligh Uddin <baligh@google.com> 1414085242 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085242 +0000

am 5382925f: (-s ours) am 5b120dfd: (-s ours) am 788475e9: (-s ours) am 7881f431: (-s ours) am e0916aec: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit '5382925fa1b209315395874b0cf5027e43f70235':