tree 3064e746e184b07a0e9dc9cdf0da94e82e70ec39
parent ed9a9cc649b4861ecae3240e5e188c266a6eba8f
parent 0bb654c9b532409be930c3f2431a8042ca86e5b7
author Bill Yi <byi@google.com> 1538384385 -0700
committer android-build-merger <android-build-merger@google.com> 1538384385 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a am: 77b862002b  -s ours am: 4c4783d520  -s ours am: 2fa324458d  -s ours
am: 0bb654c9b5  -s ours

Change-Id: Ica4475ae132aafde4f2c06944b05a7bd2475365c