tree b6cdbb6f2b5e1b72a806c38fed2ae5124686adfe
parent 52105c17e1bae851514dc0ab8f2034b08b22c648
parent dd238b5604e14d0da458f9b7589097d365a9dfd1
author Jim Miller <jaggies@google.com> 1377892612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377892612 -0700

am dd238b56: Merge "Attempt to fix missing clock bug" into klp-dev

* commit 'dd238b5604e14d0da458f9b7589097d365a9dfd1':
  Attempt to fix missing clock bug