tree 6d0d0e65183070ec2664263a916fa9edef1a635d
parent afff39ff53c8d64ab8a04111e126b0daa144feca
parent cd15bcfecaabbec94a7ce4b51027f8f2aa1f71a3
author James Mattis <jmattis@google.com> 1609951419 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609951419 +0000

Merge "Update to Diagnostic Callback flows for multilayer" am: 829d6494fb am: dd0a2b3ed2 am: cd15bcfeca

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510596

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58fea937ee7f785efe3ff36d4bc9cf506c87a3ff