tree 42b5b56f09da138712bb0c62ba94603f1d6585c5
parent cb7eff6a34f6a276d798669a206661c248e2bcb2
author Christopher Tate <ctate@google.com> 1478205161 -0700
committer Adam Seaton <aseaton@google.com> 1481235121 -0800

Correct overflow check in Parcel resize code

Fix merge conflict into nyc-mr1-security-a-release
Bug 31929765

Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467