tree e5714b2c79d812728cfeaabd8faf95a2e9e248ef
parent 43d911836deb9c4e88645dea5cbc5c92281101b2
parent 5ac4c8b94fba7f3f9d78f034d0e02d0fc0bc9233
author Xin Li <delphij@google.com> 1567710216 -0700
committer android-build-merger <android-build-merger@google.com> 1567710216 -0700

[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 244dc17f49 -s ours
am: 5ac4c8b94f

Change-Id: I691b1c0c79a17e5474e1e4981c2c3a5307f79787