847832f10f413f695912d54d61bf68180e9c335a - platform/packages/apps/AlarmClock

commit: 847832f10f413f695912d54d61bf68180e9c335a
[log]
author: The Android Open Source Project <initial-contribution@android.com>
Fri Feb 05 14:18:58 2010 -0800
committer: Android Git Automerger <android-git-automerger@android.com>
Fri Feb 05 14:18:58 2010 -0800
tree: 67fd8daed633359bad3e6a65da1d54fb9238732d
parent: bcf10d864086d2aca0b76db0f55be3f25a5fe4f5 [diff]
parent: 5bac1db49ae882e03834340fc39c3342c4c09e72 [diff]

am 5bac1db4: am 37c67d32: reconcile main tree with open-source eclair

Merge commit '5bac1db49ae882e03834340fc39c3342c4c09e72'

* commit '5bac1db49ae882e03834340fc39c3342c4c09e72':
  android-2.1_r1 snapshot

tree: 67fd8daed633359bad3e6a65da1d54fb9238732d

res/
src/
Android.mk
AndroidManifest.xml
MODULE_LICENSE_APACHE2
NOTICE