[automerger skipped] Merge "Snoop Logger: fix descriptions" am: 5fd265405c
am: 57f3e9428f
am: 6ea3322de4
am: 4df2d78817
am: 1d6757782c
-s ours
am skip reason: Merged-In Ie6a6b27247896e2a9a410197135e44a22ab1428c with SHA-1 c0a7e8f8f0
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I7c450179fe4b7403bf7486d7a13b7f10cf70d629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: