tree 43d4f0dd653dfa57f34f974465ae23dacaa92b14
parent 5f3045cae792fd2fa67a931fe1cc03245eaecc2e
parent 486bd1e3578960809238b840fcf196657ffd52d3
author Bernardo Rufino <brufino@google.com> 1645452150 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645452150 +0000

Merge "Add @hide Bundle.getParcelable() with explicit type" am: 58b4c57393 am: 486bd1e357

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

Change-Id: I49ededbfb0e5b52a50997247debef5c04b9edf5c