Jim Miller 6dec1f60ae am f8da578e: resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp ...

Merge commit 'f8da578ee7d398f21e002947505cddf827937a98'

* commit 'f8da578ee7d398f21e002947505cddf827937a98':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.

2009-11-24 14:47:02 -08:00

..

assets

…

res

am f8da578e: resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp

2009-11-24 14:47:02 -08:00

Android.mk

Explicitly specify that online-sdk depends on framework-res. (do not merge)

2009-11-04 16:04:26 -08:00

AndroidManifest.xml

add reboot() method to PowerManager

2009-11-19 17:18:31 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…