tree 803ae4cf189e038720c0eb718a6080d909a3a9e5
parent cfb283cfe1959382652809607684c0cab542e264
author Marco Nelissen <marcone@google.com> 1452631056 -0800
committer The Android Automerger <android-build@google.com> 1453744886 -0800

DO NOT MERGE Fix out-of-bounds write

Bug: 26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
(cherry picked from commit 5403587a74aee2fb57076528c3927851531c8afb)