tree b7489e833831cb1e58197fbf18898ae4d9d92db9
parent b1f618fe09564de07a46b6fea1bed5f5bb8352de
parent 8234b2cdf71d4247a556ee1e49dbb18d8e7a53d1
author Baligh Uddin <baligh@google.com> 1412532991 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532991 +0000

am d0977816: (-s ours) am e57fcc08: (-s ours) am 65bfcc68: (-s ours) am 81625094: (-s ours) Import translations. DO NOT MERGE

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