tree 17fcb376949dbc26720180eead9298533a7e704b
parent 465c5849d78e44d26239046f2a517b50f56d922d
parent 5dc48189eeef3c322b22d78c6960e1a7d0ee4102
author Christopher Ferris <cferris@google.com> 1518016034 +0000
committer android-build-merger <android-build-merger@google.com> 1518016034 +0000

Merge "Check that dex pc is in a valid map." am: 3ff3ff1c36 am: 7d362f1eb7
am: 5dc48189ee

Change-Id: Ibbea890b2d7815e902372af8b9100af505a4d254