Jim Miller a48fb8aa68 am 11cc925e: am a4c96aa2: Merge change I88bb16e6 into eclair ...

Merge commit '11cc925efbe582d617ffd01894f920f9a675adc3'

* commit '11cc925efbe582d617ffd01894f920f9a675adc3':
  Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices

2009-10-01 11:46:25 -07:00

..

assets

Automated import from //branches/master/...@141533,141533

2009-03-24 20:29:58 -07:00

res

am 11cc925e: am a4c96aa2: Merge change I88bb16e6 into eclair

2009-10-01 11:46:25 -07:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

AndroidManifest.xml

Allow wallpaper picker to work.

2009-09-27 17:05:46 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00