tree 6b056ffbdfa1c85edd2599a1b69cd2b15b565781
parent a815fe5d4c5f57878fb63588fd12a2d833929507
parent 89858102c2272fb10c040b447eb482ddc497585f
author Rubin Xu <rubinxu@google.com> 1539300246 -0700
committer android-build-merger <android-build-merger@google.com> 1539300246 -0700

[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b am: b1498d1d87
am: 89858102c2  -s ours

Change-Id: Idf0858840a8472059899bfd565e4182c2c210693