| commit | f06e372cf9be356721abfc32ff2752e452dcebbd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:23:01 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:23:01 2010 -0800 |
| tree | b9f41e57390e0b43b0d7ba01460a184dfba6c017 | |
| parent | 74ccbf7aa77213d6df41990936d5f30eb06afe43 [diff] | |
| parent | c13fbca985b333cfb09d2b29875b36594dd44d64 [diff] |
am c13fbca9: reconcile main tree with open-source eclair Merge commit 'c13fbca985b333cfb09d2b29875b36594dd44d64' into eclair-plus-aosp * commit 'c13fbca985b333cfb09d2b29875b36594dd44d64': Add uses-feature for live wallpaper sample. android-2.1_r1 snapshot