Android (Google) Code Review f0f6c51e13 am c134c281: Merge change 9265 into donut ...

Merge commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f'

* commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f':
  Highlight IMEI-reading as part of READ_PHONE_STATE description

2009-07-30 16:20:51 -07:00

..

assets

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

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

res

am c134c281: Merge change 9265 into donut

2009-07-30 16:20:51 -07:00

Android.mk

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

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

AndroidManifest.xml

Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.

2009-07-30 15:27:00 -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