tree be7a9c7e385729baac1f177141725fd02e9d4529
parent 2dcedc156a5ccfbd19af9aadd39d623a1c4a32c4
parent 4448f63145e371d64292f1503ecfab5e05603a80
author Bill Yi <byi@google.com> 1491124579 +0000
committer android-build-merger <android-build-merger@google.com> 1491124579 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bcd194eb04  -s ours
am: 4448f63145  -s ours

Change-Id: I44a2fcad7ce27350d110263ce2083b489bb47762