tree c1acd42a3525f9ba06a28710d0f75b1d9dea024d
parent a9dc465a8e416f053046c8c9643b3ff48ec20d71
parent fb5729793892c32667a318c35716f0f4d4b6ffb0
author Geoff Mendal <mendal@google.com> 1418167178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418167178 +0000

am fb572979: (-s ours) am 5a9bbe1d: (-s ours) Import translations. DO NOT MERGE

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