From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 5 Feb 2010 16:50:03 +0000 (-0800)
Subject: am 5553de61: reconcile main tree with open-source eclair
X-Git-Tag: android-x86-2.2~36^2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-DeskClock.git;a=commitdiff_plain;h=92c9a6fe2e5a576de50d08e08a332a774f4cf2d4

am 5553de61: reconcile main tree with open-source eclair

Merge commit '5553de611a3a65dc5f2fa31d3c49b7f7a6609a36' into eclair-plus-aosp

* commit '5553de611a3a65dc5f2fa31d3c49b7f7a6609a36':
  android-2.1_r1 snapshot
---

92c9a6fe2e5a576de50d08e08a332a774f4cf2d4