tree 32ab387669ab4017be307c67cbe1b9482c5e2212
parent 3a8534f18e9f15af7749481cab4a0d538cd41c1c
parent 360cb87db4de4d8900e83d71efd846625263a58a
author Fyodor Kupolov <fkupolov@google.com> 1489112035 +0000
committer android-build-merger <android-build-merger@google.com> 1489112035 +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

Change-Id: I424fd036c097317c6f7fae26ea8a46e3f35a1af9