tree 317a366c1ef24ba5c396b812c2ebff7782ab31a6
parent f427688c37561a525927db8003c1fcb3f9cbed94
parent 36c103d685a6ba0f04c52bad2cb666789f5179dc
author Geoff Mendal <mendal@google.com> 1436999251 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436999251 +0000

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

* commit '36c103d685a6ba0f04c52bad2cb666789f5179dc':
  Import translations. DO NOT MERGE