tree 4a3a3ffe8bc02f5885311b1e90d862ad20d417b1
parent 1f24b14a6af526c7d703903a96ed3277c7d9889e
parent e0916aec7d5d1d83c8ef09c5e8310f05acc568bb
author Baligh Uddin <baligh@google.com> 1380837611 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380837611 -0700

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

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