tree 91b871a593d444b395c5a59f113ad1d9294afbeb
parent 35c1bb7cf7ffea099e01a5b5c27b27fa992254df
parent e3d5b84acbfa0916134aa7f518772b992bef9137
author Jooyung Han <jooyung@google.com> 1599641895 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599641895 +0000

[automerger skipped] Merge "statsd: mark libstats_jni as jni_libs" into stage-aosp-master am: 14a6871e43 -s ours am: bcb603908d -s ours am: 9077548277 -s ours am: e3d5b84acb -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: I8394ef8925fef24d1fd630655aae6cb4a10e34e4