Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev
am: 1348399885

Change-Id: Ibca40676bb609379cda3797b5120be76a62041d3