Skip to content
Commit aa6f5181 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Add settings and reset operations for demo users" into oc-dr1-dev am:... 

Merge "Add settings and reset operations for demo users" into oc-dr1-dev am: 88710dea am: 8121e6c1
am: c2fabb2f

Change-Id: Ie286d80440bfdb0de87e4f34a45acfdc99998bda
parents 47d8634c c2fabb2f
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