tree ee2449b9683f4ea9a0108456a53eda53b61c3f55
parent 31b54b9803fafac5060983667a214866b55ff3c3
parent e0f30ecdb96eaf4486614cf0c20d7ec5407c48e1
author Fyodor Kupolov <fkupolov@google.com> 1489089921 +0000
committer android-build-merger <android-build-merger@google.com> 1489089921 +0000

[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6  -s ours
am: e0f30ecdb9  -s ours

Change-Id: Iffa0c61e06cbfe2e66912c26b0a3d81660bc5a91