Skip to content
Commit 46337ff1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Fixed how com.android.server.pm.Settings handle... 

[automerger skipped] Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f000890 am: 22ac3a45 am: 8a027191 am: 875cba23 -s ours

am skip reason: Change-Id I6cd17ac588a4d95bf0ea704dd18387e19eeab374 with SHA-1 4c789e01 is in history

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

Change-Id: I72f3c9c8ad212eddb23f9001475e5ee5ac4c91cc
parents 31c8ce39 875cba23
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