Skip to content
Commit 5a5a6b96 authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Correct the name of enum UserType item" am:... 

[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130 am: 9c01d142 -s ours am: f593ec56 -s ours

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

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

Change-Id: I8d645b01be7245e989707f5f89ba2d458a0ce81a
parents 48ea01b4 f593ec56
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment