tree a7d396de84a8a840360687d77b5013e38119123d
parent 3d7a421abf8571397de674583aeef8492b010978
parent ac02d51ea3301672f731ec5115a21e701be91fd7
author Hao Ke <haok@google.com> 1665002115 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1665002115 +0000

Merge "Add safety checks on KEY_INTENT mismatch." into qt-dev am: 459808b2c0 am: 64e4cbc1d8 am: ac02d51ea3

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

Change-Id: Ia84e89e68912e5e11c38ebb3afa8258b9143491b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>