Kenny Root 18490fb93e resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp ...

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53

2011-04-12 10:27:15 -07:00

..

binder

Clean up use of HAVE_ANDROID_OS

2011-02-16 10:56:32 -08:00

camera

Merge "Add YV12 preview format to camera parameter constants."

2011-02-24 02:51:17 -08:00

diskusage

…

gui

SurfaceTexture: disallow unsupported uses.

2011-03-15 10:37:37 -07:00

hwui

DO NOT MERGE Take fake bold font property into account.

2011-03-23 17:59:44 -07:00

rs

Fix for bug 3434228

2011-03-16 19:28:25 -07:00

storage

…

surfaceflinger_client

ANativeWindow: add query for the concrete type.

2011-03-14 17:47:11 -07:00

ui

fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out

2011-03-17 00:04:42 -07:00

usb

am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak

2011-04-11 14:24:11 -07:00

utils

resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

2011-04-12 10:27:15 -07:00