tree 02cce0896b530595982270ec0dfc3163c65a7321
parent afe9f55ee6ba3eaee02e7b13809a534ebe98d34a
parent 2d49e2de6e0927f0b1dd7122f8c5ef0f5c932278
author Marco Nelissen <marcone@google.com> 1465594272 +0000
committer android-build-merger <android-build-merger@google.com> 1465594272 +0000

Fix possible out of bounds access am: 751b4eba25 am: b201f04d8c
am: 2d49e2de6e

Change-Id: Ie0b97678f3c3281c52ab8cce5447e07f45b4c6c9