tree b1c5f725dfaa6fb5afd66d0b35779e019317b8e4
parent cc9896a5e4818ca7d76d2315a203f9df2909459b
parent 4a1e89ba44a4682a189f14653a7d08af45fed6a7
author Bill Yi <byi@google.com> 1494657249 +0000
committer android-build-merger <android-build-merger@google.com> 1494657249 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 4a1e89ba44  -s ours

Change-Id: Ie8f871a6a9e0083997497179c669de40996ff165