tree 28046dd631ccf121fc06482e067ba49dc44207b1
parent 8be460c8da03ea321feda261c8ffa89954f8a98a
parent 1ca1fc01931bad50e378f8bb278c8177f29bd79e
author Xin Li <delphij@google.com> 1567720326 -0700
committer android-build-merger <android-build-merger@google.com> 1567720326 -0700

[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e0f4c66701 -s ours am: 325d68e8cc am: ef8f99fbad
am: 1ca1fc0193 -s ours
am skip reason: subject contains skip directive

Change-Id: Icdd6db864459e2f96d183460f88abf1c77af0f9f