tree dbdc1a25bdd513b2b4f89fb2961da7e4437596d6
parent 5fb800bc2c2722fde5996523c2f8515c9c1160ca
parent 6c50f308281ef0dbc0f396376a03eb82e7ebd14a
author Bill Yi <byi@google.com> 1459012681 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459012681 +0000

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