tree 68586f4fd910c3b08a9608d7be5e186c9df572c6
parent 300e674c379c606f1737c05aab4a96bc9c33c31f
parent cb5c455ed10c87d7a8910e7b6a3694bc2b0d9c5b
author Xin Li <delphij@google.com> 1567708577 -0700
committer android-build-merger <android-build-merger@google.com> 1567708577 -0700

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

Change-Id: I7b0a3625ef33ec814e9800463d72656428a38058