tree 4939141f83d960ab04317af2070384404797a2e7
parent e3739611300234a7e45e060127cda31c64228d4b
parent 484cbd1bcc65a0dc7a0251b018b20683f1caba2e
author Geoff Mendal <mendal@google.com> 1439230099 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439230099 +0000

Merge "Import translations. DO NOT MERGE"