tree 51697b8bd1dba4a86845a4e6e33fd0fe43dc9707
parent 967bb181c1ee4e4779e457a1f765b3bdc7f0a230
parent ec580cac447b40663ba848254a4e2ddd79b93935
author Geoff Mendal <mendal@google.com> 1446659224 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446659224 +0000

Merge "Import translations. DO NOT MERGE"