tree 756122874cd1e879750c0fc004ed14f7c1309118
parent f64cc759bbde5da34742b7f439712ceced8ee4df
author Romain Guy <> 1239312084 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239312084 -0700

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

Automated import of CL 145482