tree 41e66f6c50a8e5aa9b8b5d13b3aca612ab6653b5
parent 826d31c60370ad42c0eb0e460124b0258fbec09a
author Christopher Tate <ctate@google.com> 1478205161 -0700
committer gitbuildkicker <android-build@google.com> 1481848351 -0800

Correct overflow check in Parcel resize code

fix merge conflict into nyc-bugfix-release
Bug 31929765

Change-Id: Ie27b9945f1de056624668869bdf9a5578abff467
(cherry picked from commit 85ab52f18a4e73809f09581a74b53492103e481c)