tree c3b323036f779e75ac12459f705bb80979470d10
parent 181a3af45b3d39de4f0bcd34177355350b17a0af
parent f67472adfcc4479aafd9f7dc56677e2323583416
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1533711498 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1533711498 +0000

[automerger] DO NOT MERGE Fix OOB read before buffer length check am: 6fe963e270 am: f67472adfc

Change-Id: I06022c8ab062e4422b443d49869293b777058b20