tree b7489e833831cb1e58197fbf18898ae4d9d92db9
parent a7d2014dd59952b0e3e99d8ab6a0824ed5e4f99b
parent f9af64eb56b9fd32f5dcfdb914cde96dfd39bd4b
author Baligh Uddin <baligh@google.com> 1412531381 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412531381 +0000

am 0d83f5a6: (-s ours) Import translations. DO NOT MERGE

* commit '0d83f5a6caf8e121f552763be7999785c0492d82':
  Import translations. DO NOT MERGE