tree 42b5b56f09da138712bb0c62ba94603f1d6585c5
parent 675e212c8c6653825cc3352c603caf2e40b00f9f
author Christopher Tate <ctate@google.com> 1478205161 -0700
committer Adam Seaton <aseaton@google.com> 1482181003 +0000

Correct overflow check in Parcel resize code

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

Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
(cherry picked from commit 65dd433f0db2fe402dc725f7012c6e26769b3224)