tree d293cb16bd1a4fec54d928c084531b8fae53bc6c
parent 0cc5fe37a6a879c6548fb6b0fe69c22612659650
parent 0e4a8f5f416662093a95b63d3eceed3368f2e10e
author Bill Yi <byi@google.com> 1486477129 +0000
committer android-build-merger <android-build-merger@google.com> 1486477129 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f3f4f78dc7  -s ours
am: 0e4a8f5f41  -s ours

Change-Id: Ic0894bfb2f8e5d5c9850caf6110e4e24959e6bac