tree d293cb16bd1a4fec54d928c084531b8fae53bc6c
parent b01f312dd08a91006364d1fe3c659619e3669e2b
parent 5e1652a7c9e385104da3451073869d52d0e5dfbc
author Bill Yi <byi@google.com> 1486477239 +0000
committer android-build-merger <android-build-merger@google.com> 1486477239 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6654edae49  -s ours
am: 5e1652a7c9  -s ours

Change-Id: I12564fcecc14484b8cf32c669f77bf5f11c0fa87