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

Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev am: 64a16be2 

am: 1ee8470c  -s ours

Change-Id: If308100e44ef4e8cc7324a66d6a73db0378bde50
parents 45b4361e 1ee8470c
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