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

Browse Source

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: I99939c5b5640de3af3ceb7624c893c4a4a101b2d

...

This commit is contained in:

Bonian Chen

2020-08-10 11:27:36 +00:00

committed by Automerger Merge Worker

parent 3dfd917c08 db42e97e81

commit f9573a79cd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available