tree a9c17784b4a2c12714b3c46d36e3bf50890ce6de
parent 992393481ba7e7af6cc4c626e1c660ed869148cd
parent ffab862f25dffe3c9c9d688cc1eb9b936db10734
author Geoff Mendal <mendal@google.com> 1423770072 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423770072 +0000

am ffab862f: (-s ours) am 614e584a: (-s ours) Import translations. DO NOT MERGE

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