Amith Yamasani 912f01865a am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev ...

* commit '68c308607b01bafd31c91572a81f4563e2199260':
  Don't update global table when upgrading secondary users' database.

2012-12-12 11:46:41 -08:00

..

res

resolved conflicts for merge of d7337fb9 to master

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

src/com/android/providers/settings

am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev

2012-12-12 11:46:41 -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

…