tree d5a3be68cffae4bce83eebb4220f068216006d6a
parent 0412ff9c1e3e10677db888ab3b4f5a964ff83613
parent 50cac03f371590e89fbe3cc27292ad1f7e87ce00
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1686176298 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1686176298 +0000

Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: Ia1640c6f62b2c3260620a775a439e5dbd715c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>