am 3aa78fb2: Merge "Pressed the "dim" button on the clock one too many times." into lmp-dev
am 3aa78fb2: Merge "Pressed the "dim" button on the clock one too many times." into lmp-dev

* commit '3aa78fb25aea64640574f1ec3156a71b8a53f6ec':
  Pressed the "dim" button on the clock one too many times.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base