Jeff Brown d4b1c4424d resolved conflicts for merge of be6ab576 to ics-aah ...

Change-Id: I87c5679c46a58e233da30e73f068bed2af627ab3

2011-11-29 14:10:46 -08:00

..

aah_timesrv

Make the LocalClock HAL wrapper use a singleton HAL instance.

2011-10-28 10:14:48 -04:00

android_runtime

Clean up CursorWindow code.

2011-10-06 14:40:13 -07:00

binder

am 5462bc63: Fix a leak in Parcel::writeBlob.

2011-11-05 02:35:57 +00:00

camera

Update camera continuous autofocus javadoc.

2011-10-28 00:38:02 +08:00

cpustats

CPU statistics library

2011-07-15 14:09:49 -07:00

diskusage

Move disk usage utilities to its own library

2010-11-30 16:51:13 -08:00

drm

DO NOT MERGE

2011-05-13 15:09:24 -07:00

gui

EGL: default to swap interval 1

2011-11-21 14:37:29 -08:00

media

am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1

2011-11-22 08:41:26 -08:00

powermanager

Fix issue 4604090: notification sound interrupted.

2011-07-25 18:41:12 -07:00

private

fix Surface positions are not floats

2011-08-30 18:51:54 -07:00

storage

Revert encryption mapping for device wipes.

2011-09-09 14:44:40 -07:00

surfaceflinger

am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0

2011-10-18 23:00:08 -07:00

ui

Fix application launch shortcuts.

2011-11-29 12:17:22 -08:00

utils

BlobCache: implement cache serialization

2011-10-31 18:49:32 -07:00