tree 590b3129e29790b02a942ab84045526fbdcb238a
parent 1c8fd9eaf6696aae5f04019ee4f8b7561f69c046
author Romain Guy <> 1239312044 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239312044 -0700

AI 145496: am: CL 145482 am: CL 145182 Fixes #1777943. Put the Clock back...
  Original author: romainguy
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145496