OSDN Git Service

[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 03d46b8ec2 ...
authorXin Li <delphij@google.com>
Thu, 5 Sep 2019 19:56:06 +0000 (12:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Sep 2019 19:56:06 +0000 (12:56 -0700)
commit4b8c5e40430e2adfbfd9633008c480a51e6b04ea
tree2f2fb7413c31ceb258ac0d353002305d4531e4c4
parentf003a0f6df6f94155b9db35b4b385e74726dceb8
parent8a1667b9d3ddfc8827ae9a0d65f04f25040be4bc
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 03d46b8ec2 -s ours am: 8e859c3fc8
am: 8a1667b9d3

Change-Id: I851ec26c25933ce1341a4b0dc3c0457bc7b4c5ea