tree 94c8f94b47d2b38f0f6de18d1113ea1e0b4f122b
parent 9dc62877166ae5088e248791ace8ec42a9c2e3be
parent 87b981b0cef4cfac5384c69852a8be35044cbbe1
author Kangping Dong <wgtdkp@google.com> 1695113744 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695113744 +0000

[automerger skipped] Merge "[Thread] define the THREAD_NETWORK_SERVICE" into aosp-main-future am: 87b981b0ce -s ours

am skip reason: Merged-In Iaa1b6973b2fc86886db784e5d37e804daea854e8 with SHA-1 69e0dfabc4 is already in history

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

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