tree 25e090f9cc465aea0761ee721fcde3aadf0f3556
parent cc739b61609e420141d4d57059f6d4b72e5e954f
parent 83a6b9dc614f359c869c68e4574fbfa776da199f
author Bill Yi <byi@google.com> 1470421740 +0000
committer android-build-merger <android-build-merger@google.com> 1470421740 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours
am: 83a6b9dc61  -s ours

Change-Id: I8110c325b71990a956c485d1074c073137c3611e