OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check...
authorUgo Yu <ugoyu@google.com>
Fri, 10 Aug 2018 22:11:58 +0000 (15:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Aug 2018 22:11:58 +0000 (15:11 -0700)
am: 1b9264d128  -s ours

Change-Id: I7d24941f1309ddc65e60fbc84e6354e414185ba6


Trivial merge