tree 8505139fea25bdcf5e14841032b86802b9c5d79d
parent ebfb74624d1a5d8f85ff548f4f8844a77d48df8d
parent 53ac28eafaf419fa9460da8790a854f048bd6d53
author Harshit Mahajan <harshitmahajan@google.com> 1707414495 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707414495 +0000

Merge changes from topic "cr-sysprop-fixed" into main am: 53ac28eafa

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

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