tree 38f509d392f9a8d5de1531d7ca45f43df0a0ef43
parent 3d6f270e31c4997299a2a996f08d71791fc3bd22
parent 8f512823c6e5a982a12ffbf9a34061a28f29f50c
author Geoff Mendal <mendal@google.com> 1429335076 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429335077 +0000

Merge "Import translations. DO NOT MERGE"