tree 00acd4dad978e7fd0c0ae2bf4e3c8788f2b7d056
parent f78aa704531a09513fc0bf1f4898ffeab2e9c7d9
parent 61ea9dd8478863f628ae5b142a4753d1311477a5
author Orion Hodson <oth@google.com> 1594030540 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594030540 +0000

Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258 am: b842272135 am: 61ea9dd847

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482

Change-Id: Ifbadd1b792514985e3230928a3114dd2096e4002