tree 3190e5a1a662ebeb94dbe8022744c2cce6d1bda1
parent 4bf2a8e322a4ad7859afe9adc94913bfef47a44b
parent 14a6871e432e163533a320516ace97bd67d9c3a0
author Jooyung Han <jooyung@google.com> 1599638282 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599638282 +0000

[automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master am: 14a6871e43 -s ours

am skip reason: Change-Id Ie32e88355828c8f696cce9d128eebb6da70026f1 with SHA-1 39c94c0493 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539145

Change-Id: Ie2c809af0845894a98152fd1ac2f43430f4dae65