tree 176dcb4a089a77ea87b8d62ae1bb8ab495431176
parent 9be4746eeee0034e4337f86a77914e4984cc1d91
parent da2983f95be3f7eca6d48a775688c0c56f2bfed6
author Geoff Mendal <mendal@google.com> 1417032888 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417032888 +0000

am da2983f9: (-s ours) am 54a89ab4: (-s ours) am aca062f7: (-s ours) Import translations. DO NOT MERGE

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