[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: f593ec5672 -s ours am: 5a5a6b9637 -s ours

Browse Source

am skip reason: Change-Id Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74 with SHA-1 ad14a26c2c is in history

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

Change-Id: I742f27928af935ea70f48ecaa002d228a6e70eff

...

This commit is contained in:

Frank Li

2020-06-23 02:10:04 +00:00

committed by Automerger Merge Worker

parent 3b94c959ff 5a5a6b9637

commit d6db84b14a

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