tree 87064ba6cf623455fc309bcdcc6b852b33692e0c
parent 38d2c0e6bcd839c4abfa2a7f000e8e113ab2eb82
parent 64a16be2ba39aa17cc477d7a1f796609413c6215
author Christine Franks <christyfranks@google.com> 1484782208 +0000
committer android-build-merger <android-build-merger@google.com> 1484782208 +0000

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

Change-Id: I27a89bac34e54f8ed06a8a7c7952348d7aa64da1