tree 0e3600a80cd4c3877072c5175132c350fddd287a
parent cffd9b6e6b35ae346198dd6667999fa79da702ac
parent 6e57c01c492e8cb83d7d72f29977ff9036325bef
author Xin Li <delphij@google.com> 1567714981 -0700
committer android-build-merger <android-build-merger@google.com> 1567714981 -0700

[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 6e57c01c49 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie0afe02c6f11b9395dd24ca2eacd64365eb68982