tree d538d90d8e320da1ada87888f2d8c87f07420e06
parent 0ed8331d3ee603e89fed2f3064cb3e5f3f9bcbf0
parent 1887e80fd827a579b430c03b6e4069213b881ddc
author Baligh Uddin <baligh@google.com> 1380170365 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380170365 -0700

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

* commit '1887e80fd827a579b430c03b6e4069213b881ddc':
  Import translations. DO NOT MERGE