tree e4bcf027b560a032d0a7b60baf2fd6dc0afaeb65
parent 86eb8a58af344fcf344e7f8a7b8bb0f90f3dbe86
parent dc2917fbf185c6d5bba03b1b24a44488128b8a7c
author Shawn <wahi.shawn@gmail.com> 1507832639 +0000
committer android-build-merger <android-build-merger@google.com> 1507832639 +0000

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

Change-Id: I0b73d646e05ec3c0465a5865696528c05b3721c5