[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: f593ec5672 -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: I8d645b01be7245e989707f5f89ba2d458a0ce81a

...

This commit is contained in:

Frank Li

2020-06-23 01:58:33 +00:00

committed by Automerger Merge Worker

parent 48ea01b43d f593ec5672

commit 5a5a6b9637

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