tree 62f760230c5c3b7406f08498a54c63a8fce033b2
parent ea4ef307fb8bf8f4854a5951c6cd84ae5d1d8f97
parent 9a8db29397694d139905e690346f56711a16dce9
author Geoff Mendal <mendal@google.com> 1436321474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436321474 +0000

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

* commit '9a8db29397694d139905e690346f56711a16dce9':
  Import translations. DO NOT MERGE