tree c2d3bc6e08cc558441e4ec3bbd51e8a7ebef383b
parent 5248e9366168f1b0f46632b6e51d1eb8d4bcdf7e
parent e777c277886b1e3a3d715a48bcb7545d664725ec
author Meng Wang <mewan@google.com> 1572978243 -0800
committer android-build-merger <android-build-merger@google.com> 1572978243 -0800

Merge "Do not use hidden API ParcelableException"
am: e777c27788

Change-Id: I640e1f6aa16ef101ac5eeabbe9ce4d911e57b308