tree 37f497159928f68fedd86faa2622026bfc66ce72
parent 9072be13a28ade85cdc51cb129c609727eb16adb
parent af768f5c673447ecf43b6a2625c39f94b74d23e5
author Bill Yi <byi@google.com> 1457671303 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457671304 +0000

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