tree 1e1b19a4586d307c8bfcc8cb91a081a63ecd8e55
parent 07c6fc5e9bdca3c1caf254e5727b83259607fde8
parent 128fa0b747e258e0da2cca7addf51b40e7f424da
author Baligh Uddin <baligh@google.com> 1408164687 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408164687 +0000

am 128fa0b7: (-s ours) am d1fd3ea9: (-s ours) am 3ef1c1fc: (-s ours) am a61caf47: (-s ours) Import translations. DO NOT MERGE

* commit '128fa0b747e258e0da2cca7addf51b40e7f424da':
  Import translations. DO NOT MERGE