tree 623403c4f82c2ff5844fe31238faf6364e3f57d5
parent 28d342d4a5438520baad89522490c8d9310b07c1
parent f036f26225f774f2ae67070721ec5b043e34b512
author Baligh Uddin <baligh@google.com> 1442596594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442596594 +0000

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

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