tree 87d2a0b919a243e55e42e35673a8f370c750ae25
parent 81fed39da361ba3d8bfa8e346aa5d5b59d9fe506
parent da1e78bf37891c4abbbfd42b8cd72f897dae67d3
author Android Build Merger (Role) <android-build-merger@google.com> 1487189797 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487189797 +0000

Merge "Security fix for overflow check. am: ebb6f04c88 am: d44ed48f0c am: 6d524288a4" into nyc-mr2-dev-plus-aosp