tree ac4447e60fa2d5baa10cbac0b40ad2fdabe8f04a
parent 111d166017c83f3a40358b4c412eed96d56b36ca
parent ea34eb0f89b737c822a5d08e6b8258479d6c4ea7
author Geoff Mendal <mendal@google.com> 1418667782 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418667784 +0000

Merge "Import translations. DO NOT MERGE"