Kenny Root 53e75ea847 resolved conflicts for merge of 485de781 to master ...

Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f

2010-08-24 09:57:33 -07:00

..

binder

am 245cb784: am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread

2010-07-27 14:04:14 -07:00

camera

am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread

2010-08-24 09:01:27 -07:00

gui

Added SensorManager.getMinDelay()

2010-07-29 18:18:00 -07:00

hwui

Add support for textScaleX.

2010-08-20 18:42:37 -07:00

rs

Renderscript samples.

2010-08-23 10:24:10 -07:00

storage

Reorganize MountService IPC

2010-08-20 13:17:12 -07:00

surfaceflinger_client

Change the framework to use the new camera preview path.

2010-08-23 14:31:30 -07:00

ui

Merge "remove unused pixel format" into gingerbread

2010-08-19 13:37:35 -07:00

utils

am b90b9d54: am 6be23712: Merge "Free created FileMap when uncompressing files" into gingerbread

2010-08-24 09:02:28 -07:00