OSDN Git Service

Merge "Add is_on_jni_thread" am: 01d2c72529 am: b0a4f334ac
authorJakub Pawlowski <jpawlowski@google.com>
Thu, 30 Nov 2017 08:27:22 +0000 (08:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 08:27:22 +0000 (08:27 +0000)
am: 943b296864

Change-Id: I1ead571f145d502f96fcf3b910b23b9a28b39cd9


Trivial merge