tree fc863d7c20a49306aa6763046e9b74c5a7edce64
parent c8be8e76f2d18c3cc3ff252e0a230bc7f9171ea0
parent ea2c0d4c1483da719e0ae5fee51bec0994087777
author Baligh Uddin <baligh@google.com> 1396924295 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396924295 +0000

am ea2c0d4c: (-s ours) am 37b49b18: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

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