tree 10da860fcff71886af91d082e31f0e1917926848
parent 95391609d7a7b98bc4f4c42c87d64e783db10875
parent e201854185b2b600d479e0357f10747c33e1734f
author Baligh Uddin <baligh@google.com> 1414566078 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566078 +0000

am e2018541: (-s ours) am b2ad3df7: (-s ours) am 192725b0: (-s ours) am 20985b6e: (-s ours) am 1887e80f: (-s ours) am 4082c8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

* commit 'e201854185b2b600d479e0357f10747c33e1734f':