tree f665b3da1b8f77acaabc4739c8cc5e15aa117402
parent 4b5b0ab85ebeeefeb35cd0f9897c7bfeca91b419
parent 50e61bee5ac52f7e63d018c13115240f6fc4af11
author Geoff Mendal <mendal@google.com> 1415844760 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415844760 +0000

am 50e61bee: (-s ours) am 3bf6d4a5: (-s ours) Import translations. DO NOT MERGE

* commit '50e61bee5ac52f7e63d018c13115240f6fc4af11':
  Import translations. DO NOT MERGE