tree b3254afac14c51a1c8321fbc62449293d2c48b29
parent 8e14489820b4eb4022807928a731047556a29aa4
parent f72d1f78df6b058eccac31ddabaa9470844f5294
author Andreas Gampe <agampe@google.com> 1524158739 -0700
committer android-build-merger <android-build-merger@google.com> 1524158739 -0700

Merge "ART: Properly check for attached thread in CheckJNI" am: cb329022c3
am: f72d1f78df

Change-Id: I903041e9062fab50849b9b209b2cfe6dce0f916c