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

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

Change-Id: I740e45eba5e132f7bef1c4544e12b85a7bfe3e28