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

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

Change-Id: I41227334535dd77f1990f90b02873fad0890908b