tree af6b39eca72de9ea36068e978296de33cd233594
parent 300a7b9d8a5991346c776d5d0dcc6cab322ad11a
parent c661b70d60eb01277e58291f01ed9f97baf21d1f
author Treehugger Robot <treehugger-gerrit@google.com> 1607329342 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607329342 +0000

Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da am: c661b70d60

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

Change-Id: I9cab7d61cfe9fcf6e551b6c225bd36fd222b1753