tree 12aa58d1320e3eb3fff9412a3e648cbcdca20b6a
parent b4103433ef777a566913d189819e35817adec46b
parent 75a058499dab1193c75bd1ad07b00f39c3b57bf4
author Geoff Mendal <mendal@google.com> 1458365816 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458365816 +0000

Merge "Import translations. DO NOT MERGE"