tree ab1d6c7757276e3886a8284b391f29b2a4c17f3e
parent 71322c1ac119bb51b107533d9365ccd53060676b
parent 78a3412f3901299c37077bbfbfd73a225c78890c
author Bill Yi <byi@google.com> 1471301592 +0000
committer android-build-merger <android-build-merger@google.com> 1471301592 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0246325287  -s ours am: e4607a098c  -s ours
am: 78a3412f39  -s ours

Change-Id: Ic4b01cdcd778fe1c095832844c90d12b4f6eba26