Jeff Brown 88e7b31ba1 resolved conflicts for merge of df3cccf3 to master ...

Change-Id: I425496a9fc4e9cbc50ad6938e9dccb14827d9558

2010-10-27 22:18:43 -07:00

..

binder

convert one of the LOGE to LOG_WINDOW msg to reduce grief

2010-10-26 16:44:44 -07:00

camera

Camera framework change required for 0-memcpy recording

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

gui

Fix typo which causes sensors to fail miserably

2010-09-16 21:41:13 -07:00

hwui

Merge "Remove unnecessary GL calls."

2010-10-26 16:31:31 -07:00

rs

Begin adding async allocation creation.

2010-10-26 13:09:17 -07:00

storage

am c3041432: am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread

2010-10-13 15:58:59 -07:00

surfaceflinger_client

am 85c5ca07: am 2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread

2010-10-26 12:26:23 -07:00

ui

resolved conflicts for merge of df3cccf3 to master

2010-10-27 22:18:43 -07:00

utils

am 7ba8c44e: am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread

2010-10-22 09:14:28 -07:00