tree 583835f7a325d063f863f3efc61a4d95405c6a69
parent aeddf4594130f9819e72943717f76c6912fd0d69
parent ed92902c8b37767678649c930b8671c090fe1e4a
author Orion Hodson <oth@google.com> 1587036230 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587036230 +0000

Merge "Add explicit dependencies on jni_headers" am: c0fe0ae29f am: 6963d8e1c8 am: 18f7afccb6 am: 98d4cf4125 am: ed92902c8b

Change-Id: I6269e5e702d4930c86042c1bb1d812853f17c355