Skip to content
Commit 43153f18 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

resolve merge conflicts of 5201a624 to nyc-dev-plus-aosp 

am: cc8c594a

* commit 'cc8c594a':
  Handle PhoneStatusBarPolicy user switch callbacks on main thread

Change-Id: I816905527f5061e7af2fe14b42f9c0397036bdb7
parents a90127dc cc8c594a
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