tree a4cb1b0012807f769365878a56d5dc3dcd1974a1
parent 7e825894bd9bb50af11cc4e9225299d6632359a9
parent 9741440ab95da487c27b884b87fa0e73287c8b6f
author Hyundo Moon <hdmoon@google.com> 1561393371 -0700
committer android-build-merger <android-build-merger@google.com> 1561393371 -0700

Merge "Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885 am: d762136f02" into qt-r1-dev-plus-aosp
am: 9741440ab9

Change-Id: Ia5fc024f9f6885dbf5c00e0d8da46cdd1e24980c