[automerger skipped] Merge "Add Constants for UsageSetting" am: 569fbec7ef am: 4b9ed09226 am: 8b0cf59365 am: c20de31377 -s ours

Browse Source

am skip reason: Merged-In Ief078770b44719e105828bb61d3768ad24e277dd with SHA-1 793736cced is already in history

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

Change-Id: I22491469a030043255fc372bfeac841ca981bb1b

...

This commit is contained in:

Sarah Chin

2022-01-05 21:23:28 +00:00

committed by Automerger Merge Worker

parent ffe4331a9b c20de31377

commit 97bcd8e69d

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