tree bf7ebcdf1d49cb3bddc2eb6684f91fe32bb11710
parent b3530295b678b6b380db1cba88d400be031718f6
parent 6db4699a62e0c27d9eb043ff51953c73c064dd74
author Geoff Mendal <mendal@google.com> 1430312030 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1430312031 +0000

Merge "Import translations. DO NOT MERGE"