tree 64e5b8132d2a1c4ca56c3f59b5d438bab0de5c96
parent 8c47b335b0dd06efbcbf17e26df2be67a33a15f1
parent 593aca12c2f7bf39ca8d4ae944f36a88bd4a48cf
author Julia Reynolds <juliacr@google.com> 1437148915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437148915 +0000

am 593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev

* commit '593aca12c2f7bf39ca8d4ae944f36a88bd4a48cf':
  Support 24 clock displays in demo mode.