tree 1a364ebed430618a6d92bb6b083861af86f0c11e
parent 3f2dd59e7cd06e176331b18c486c2895b82279d4
parent c5378ab518dfd5e4258d36d71df3d78a0cb76cdf
author Geoff Mendal <mendal@google.com> 1439061617 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439061617 +0000

am c5378ab5: (-s ours) am 2c636248: (-s ours) am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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