tree f2a94dd75e25e10e97dc9475f0ef84ba5a61ae34
parent c7db626e572e8a57355ea7b6e991c2e150f26dbd
parent 63725cbf1249b9099758d254c6ebcef593594c3e
author Bill Yi <byi@google.com> 1477378521 +0000
committer android-build-merger <android-build-merger@google.com> 1477378521 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9421be2011  -s ours am: 45b0084348  -s ours am: 02106f20a3  -s ours
am: 63725cbf12  -s ours

Change-Id: If450a2391a3a9e3efb0b8085e42ea1cdb273a728