tree 2b63da15310105f86dbaf79f95b89b21de1d9aa1
parent 74dae3378a4dfa885118f0ff5c807b42f3f9fb28
author Christopher Tate <ctate@google.com> 1478205161 -0700
committer gitbuildkicker <android-build@google.com> 1483555034 -0800

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)
(cherry picked from commit 54d46f2f381c3350363479380fadcda925412b51)