tree 866b5e3f147599c59f7058ddfa1bb95efd5af294
parent 0ec0d080f157c7555229b742de08472d7f5a2af7
parent 7a386dbd1599dbb4dc086200462c8cd5eaf112ad
author Xin Li <delphij@google.com> 1567715255 -0700
committer android-build-merger <android-build-merger@google.com> 1567715255 -0700

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

Change-Id: I03e658fd5e5b360e27551a9cdb1f739368d58bdb