tree 41fc1cbf497bb2fbb178c65a082334c4475322f9
parent c093f72b18ff45bd66c8884ef667399aa5891b9f
parent 6e33ee380bcac06505442b0d787a5b6e9be4ebae
author Treehugger Robot <treehugger-gerrit@google.com> 1586298643 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586298643 +0000

Merge "Add explicit dependencies on jni_headers" am: 3c0c52be3f am: 6e33ee380b

Change-Id: I50949a9d3cc65115e12ac76c7d6b2aa7d1040d07