tree 1a364ebed430618a6d92bb6b083861af86f0c11e
parent 16c377388a28360ce2e7b36a3c5857c67113c5c4
parent ea22e24c5fc41605a92ba38521725ec75a3e7e80
author Geoff Mendal <mendal@google.com> 1439060103 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439060103 +0000

Merge "Import translations. DO NOT MERGE"