tree 98e7456eec6fc6df6b7478bde91a23599e013a37
parent 6afc39822e0b98000bed7846669106bb4a0805bc
parent 530ebc1085f16a2f467ad09757ebcd8a2c518f54
author Geoff Mendal <mendal@google.com> 1438611228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438611228 +0000

am 530ebc10: (-s ours) am db76ee0a: (-s ours) Import translations. DO NOT MERGE

* commit '530ebc1085f16a2f467ad09757ebcd8a2c518f54':
  Import translations. DO NOT MERGE