tree db8dd81b9846c9c29eab3234965e95271d98e6a5
parent 62e7493876a9b8db0a4e1930ce24d3f1a8f32cb8
parent e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e
author Marco Nelissen <marcone@google.com> 1452640375 +0000
committer android-build-merger <android-build-merger@google.com> 1452640375 +0000

Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875
am: e463301aa4

* commit 'e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e':
  Fix out-of-bounds write