tree a9fc73af3653bb3c5db78ef929feee32acef5592
parent 320c9617ac8ab327d10eb11ecfa64a20f7b019af
parent faa4706fea2e0ef423c7cd6619dff6df2970c800
author Geoff Mendal <mendal@google.com> 1436801455 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436801455 +0000

am faa4706f: (-s ours) am 1fc614f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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