Jeff Brown ace7404de8 resolved conflicts for merge of d7337fb9 to master ...

Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0

2012-12-11 15:21:02 -08:00

..

res

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

src/com/android/providers/settings

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

Android.mk

Create telephony-common and mms-common - DO NOT MERGE

2012-07-17 12:23:09 -07:00

AndroidManifest.xml

Explicitly export content providers

2012-08-06 17:42:12 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…