Tom Taylor f0108cda21 resolved conflicts for merge of ad2fa35d to master ...

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90

2009-12-22 10:11:55 -08:00

..

etc

am 9db0d36c: Merge change 7600 into donut

2009-07-17 02:08:53 -07:00

res

am a9791d30: Merge change Iae3ed706 into eclair

2009-12-02 09:50:40 -08:00

src/com/android/providers/settings

Update imports to android-common

2009-12-21 13:59:18 -08:00

Android.mk

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

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

AndroidManifest.xml

Encrypted File Systems Project. Installer modifications.

2009-11-24 11:44:19 -08: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