tree 95b2369a7cbb9c69a059c0e23f6d662d33b91d07
parent 698e26bfc729189b01f0beca518d51cfc9985d22
parent 227c8c2fae03d1aaf558d184159411c5f4429273
author Orion Hodson <oth@google.com> 1545388642 -0800
committer android-build-merger <android-build-merger@google.com> 1545388642 -0800

Merge "Remove dependency on libnativehelper/JniConstants.h" am: 8d7f7a4ada am: 107a8e7582
am: 227c8c2fae

Change-Id: I3838a44b8eae2c29df5f6ac068dfc0b18eba3888