tree be7a9c7e385729baac1f177141725fd02e9d4529
parent d77296636663e16eb077001360f582c3cd49934a
parent 11a1d54f70d2da110fd4530ec8b2a1aa72765d02
author Bill Yi <byi@google.com> 1491124371 +0000
committer android-build-merger <android-build-merger@google.com> 1491124371 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e1a2ddeee8  -s ours
am: 11a1d54f70  -s ours

Change-Id: Ifd5eccfa888ab90d240fe7a56adbb6dd12cfc7f5