tree 32ab387669ab4017be307c67cbe1b9482c5e2212
parent bbb7ae05d4b66c42bfc29f2ce09a73d2e18ae8db
parent 9e2cf8e5c4ba08d3c3fecaed8c397c7038b47fb9
author Fyodor Kupolov <fkupolov@google.com> 1489116536 +0000
committer android-build-merger <android-build-merger@google.com> 1489116536 +0000

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a  -s ours am: de9cb7ed68  -s ours am: 2c112c4ad2 am: 2411b4f774  -s ours am: aa0b718886
am: 9e2cf8e5c4

Change-Id: I4d447f67d293a1cc4a187d66496cb447612eebad