tree d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
parent aa06a98b9387bf7cda7948de3f3949e82c151856
parent 3343873fa161579562e82b8fa8963094bac042fb
author Xin Li <delphij@google.com> 1567714650 -0700
committer android-build-merger <android-build-merger@google.com> 1567714650 -0700

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

Change-Id: I1456af3df971e2b8aef08d1b5ce72249861a2486