Kenny Root bff405f910 resolved conflicts for merge of d8e8186c to master ...

Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5

2010-09-28 18:16:50 -07:00

..

binder

am deaa8ff1: am a7ef18fc: Merge "Some debugging support." into gingerbread

2010-09-24 15:58:25 -07:00

camera

am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.

2010-09-21 10:44:38 -07:00

gui

Fix typo which causes sensors to fail miserably

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

hwui

Adding display lists to the GL renderer (checkpoint.)

2010-09-26 18:40:37 -07:00

rs

Fix safe for mp check in ScriptC.

2010-09-28 14:41:42 -07:00

storage

Update OBB API to include callbacks

2010-09-28 17:23:26 -07:00

surfaceflinger_client

am 495ad4f2: am beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread

2010-09-24 18:13:22 -07:00

ui

Fix bug in split touches.

2010-09-28 13:41:00 -07:00

utils

am c55f6da7: am 0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread

2010-09-24 15:22:44 -07:00