tree da11aae74b00a2b59f7ba3927fa5d1ca9eea7acf
parent 6d8c62205a96cca8f6cafe0455df4396287f2130
parent e3fc5415ed65ee7ad451069022b5405361aeb2e7
author Geoff Mendal <mendal@google.com> 1435586970 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435586970 +0000

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

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