tree a991363bbd16f571c678ef7d95c3ccaee1d96f61
parent 83c9445c7134349c1039caa1574cac5a61f42f0f
parent eaff373f9de1982fb4cf6c6ab60d1a20f4d62e8f
author Michael Wachenschwanz <mwachens@google.com> 1558464106 -0700
committer android-build-merger <android-build-merger@google.com> 1558464106 -0700

Merge "Merge "Clear the Parcel before writing an exception during a transaction" into qt-dev am: d2111df37b am: f9634408e1" into qt-r1-dev-plus-aosp
am: eaff373f9d

Change-Id: If25383f82f2b212c97583b79a3f72b11ef1e628a