tree 4e3f2c3cc680fd81e56a9946c6ece1dfc263b856
parent cc484a5cdffa6548bd7c41532e8de707d0b8482d
parent c4054a8b7f79f2d547760abc08d6bddeee5339a8
author Fyodor Kupolov <fkupolov@google.com> 1489113551 +0000
committer android-build-merger <android-build-merger@google.com> 1489113551 +0000

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c  -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade  -s ours am: e8fb34b44c
am: c4054a8b7f

Change-Id: I6834bf86950b8e6889515fcf52e930301c99ca57