tree 4e3f2c3cc680fd81e56a9946c6ece1dfc263b856
parent 2695147f2d8500745a7f73072142d983f50f6fb5
parent 221088d6df7f2e31a82751746ab9c2dae3793572
author Fyodor Kupolov <fkupolov@google.com> 1489112563 +0000
committer android-build-merger <android-build-merger@google.com> 1489112563 +0000

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 am: 3a8534f18e am: a74748d05e  -s ours am: dd472080f0
am: 221088d6df

Change-Id: I2b47df993ec31f20618b0372995176d9bb38c0f7