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

Fix possible out of bounds access am: 751b4eba25 am: b201f04d8c am: 2d49e2de6e am: a3c15ad42d am: 6c2d0e45b5
am: dbefc1dc4a

Change-Id: Iad8b05c5343f63c30c035b2f8e6f611a6056fb88