tree b57f5668c1514d597c88f44d07dfca39a54b41af
parent 15cf9d572e14a109fed1ba2c93846cc77d0a4406
parent 68b9522d459313cc7249b6bcc5ccee2ede104dd7
author Fyodor Kupolov <fkupolov@google.com> 1489116531 +0000
committer android-build-merger <android-build-merger@google.com> 1489116531 +0000

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a  -s ours am: 1e6d3f904e am: ce677737ec  -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444  -s ours am: 9c4d89c55f am: a1aa5cb34a am: e3e01cc375 am: 6ce5879e11
am: 68b9522d45

Change-Id: I0c47434e3e5297dc392a1b58a84f0f51ca89d1c7