tree 3fd819340fe0e39c35c8b9698099ed3865d14a31
parent ca5e7521cabcfea5adcf1076d3399549ca426f1a
parent e8e27b0bd73d7b7bdfc52daecbf359ab8e951c3f
author Baligh Uddin <baligh@google.com> 1443150982 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443150982 +0000

am e8e27b0b: (-s ours) am cada0b33: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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