Dianne Hackborn 8ec5b83fc8 Merge commit '1dac277f' into manualmerge ...

Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java

2009-07-01 21:19:35 -07:00

..

1.xml

AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.

2009-05-13 15:29:11 -07:00

2.xml

AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.

2009-05-13 15:29:11 -07:00

3.xml

AI 146222: Manual merge of 145980 from donutburger => master.

2009-04-14 15:40:20 -07:00

4.xml

Remove obsolete FOTA_UPDATE permission (which should never have been

2009-06-15 16:29:20 -07:00

current.xml

Merge commit '1dac277f' into manualmerge

2009-07-01 21:19:35 -07:00