tree be6c4cdfad3d8e3b43bd2523ea507ee016b0f2e0
parent 447da857463a80c83ae60857ddfaf61497db1ee1
parent 608f228933c00d122a3fb32bf02f3a80ac364dfc
author Geoff Mendal <mendal@google.com> 1439231271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439231271 +0000

am 608f2289: (-s ours) am 31a0f46f: (-s ours) am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '608f228933c00d122a3fb32bf02f3a80ac364dfc':
  Import translations. DO NOT MERGE