tree 69f928d7198d1bb4f8ec96949db40f249846e009
parent c0157fe840c0abf28e594a9324b36d1e53e002a3
parent 4d9c4f815f936cdc1d76645e6c7c0d2f49bdd794
author Orion Hodson <oth@google.com> 1586892764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586892764 +0000

Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9 am: c535cf7258 am: 5a37bc2255 am: 4d9c4f815f

Change-Id: Ia382e2341f57c5887379160a0caa1c3761dbffb5