tree c9ffa859d46f723e7d81f50ebbb3368bdd7a1fc4
parent d81d46b334eead8ad45db30d4d4f24d4124a76cd
parent 45d02673c5904d584d0c06822a177b86ba4b3caa
author Bill Yi <byi@google.com> 1491123622 +0000
committer android-build-merger <android-build-merger@google.com> 1491123622 +0000

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 45d02673c5  -s ours

Change-Id: I251062605b0d0a5ea912a510cac39ab6326f6496