tree f55f792ae52cd50d6d61168d7a2857f5aae20885
parent 64bc4fab475bd6f2a744f2ba613aa45b5e927a70
parent 6d4917b6737af77c3375c2e7aa515786d3726d9c
author android-build-team Robot <android-build-team-robot@google.com> 1525731854 -0700
committer android-build-merger <android-build-merger@google.com> 1525731854 -0700

Merge "Remove the clock view when DISABLE_CLOCK is set" into pi-dev
am: 6d4917b673

Change-Id: I2af9b5a6320f20fcf12b828b4b2bcdba10f2cf90