tree 212046cfb90dbba8529d00d2bf64145138a6f899
parent 2d1fc8a1a39d4f384bddf141b9d18b9876dc4e94
parent a3f9bea0a7fc8ead2d78a99c8c78d453cdef985f
author Geoff Mendal <mendal@google.com> 1423768844 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423768844 +0000

am a3f9bea0: (-s ours) Import translations. DO NOT MERGE

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