tree 0016934183a783ae551f824652c18a8321634acf
parent 353da3f98d86eb750b756335892c768f76cc4616
parent ff26f10fab3e79d535001b8e1c9155d7844375c4
author Geoff Mendal <mendal@google.com> 1417463050 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417463050 +0000

am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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