tree 30d6c2198921f352458b6fcb2c7dceef3f1fb4e8
parent f1c00cf3d160790c055f7a8b121193cce9be4133
parent 4b88cf0dd885a89f7dddbc98a88c66ebbf39559e
author Geoff Mendal <mendal@google.com> 1454360563 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454360563 +0000

Merge "Import translations. DO NOT MERGE"