tree 58de127fd28dd465e6f06de71fda7718763fca1f
parent 3d4d464f0a577555543d93ae1706a40f37bbf3dd
parent bad318fc935e953323dcce43e1a5939f8c9cbc6c
author Shawn <wahi.shawn@gmail.com> 1507832085 +0000
committer android-build-merger <android-build-merger@google.com> 1507832085 +0000

Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0" am: afc4e370cd  -s ours
am: bad318fc93  -s ours

Change-Id: I193fb2a306051a686ca7699e419372c86dde3a25