tree 176dcb4a089a77ea87b8d62ae1bb8ab495431176
parent 955cc16e3272f940599f767f0c0e87e3a36d107e
parent aca062f73f70789c3245dea3cea51bc65cd87f1a
author Geoff Mendal <mendal@google.com> 1417032344 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417032344 +0000

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

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