tree 0df5a6b2a05be56bcee29b2d4d83e6710422fa9d
parent f2158e6f5c8de4435b30dd51f2abf57a894a4656
parent 38d2c0e6bcd839c4abfa2a7f000e8e113ab2eb82
author Christine Franks <christyfranks@google.com> 1484782851 +0000
committer android-build-merger <android-build-merger@google.com> 1484782851 +0000

DO NOT MERGE - Fix demo mode reset notification am: b189aa6cf8
am: 38d2c0e6bc  -s ours

Change-Id: I9dd5281575fe82795dbe4d8b1fa51e9b9f021d7d