Skip to content
Commit 69ab8e1d authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'b/36021111' into oc-dev 

* changes:
  add a global control for badging
  extend TestableSettingsProvider to multiuser
parents a8fe2444 89aa2261
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