[automerger skipped] Merge "Remove PreferenceCategory wrapper" am: 75124d794c am: 80b3bb5141 -s ours am: cfe7584cec -s ours

am skip reason: Change-Id I6f4698304210bacba5c76020c375dda49330d2cc with SHA-1 896de3b48b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394552

Change-Id: I235aaed5dce0a37f429db30ffb6b16a417a8f94d
This commit is contained in:
Bonian Chen
2020-08-10 11:09:23 +00:00
committed by Automerger Merge Worker

Diff Content Not Available