tree f4bc649e9a05e3bc2f2f5e53fd0b04378151917e
parent de7ae790eae423d3217c5d26d4de965fd0098e31
parent 9d8821c496d8b688586485cd0cb52c89e4d6caf8
author Geoff Mendal <mendal@google.com> 1458383428 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458383430 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev