commit | e18e4be3616f27c8d7a81d11bd482353910a59fa | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 14 11:22:20 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 14 11:22:20 2010 -0700 |
tree | 0dc3959105a15c1f0acdc4848b3ad6cc5c51f88b | |
parent | 82a93b76a8fab6a9a619596c9a927ddda44b8fd5 [diff] | |
parent | 9f431335ab377396713b8b386ad7539b2b28eff5 [diff] |
am 9f431335: merge from froyo-plus-aosp Merge commit '9f431335ab377396713b8b386ad7539b2b28eff5' * commit '9f431335ab377396713b8b386ad7539b2b28eff5': generic.mk: Replaced AlarmClock with newer DeskClock App