Derek Sollenberger a30ed30b75 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp ...

Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6

2011-07-29 14:16:18 -04: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

resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp

2011-07-29 14:16:18 -04:00

hwui

Updates resulting from the Skia merge (revision 1327)

2011-06-13 15:07:30 -07:00

rs

Check setName() for null string + fix rsRand().

2011-04-27 13:30:43 -07:00

storage

…

surfaceflinger_client

ANativeWindow: add query for the concrete type.

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

ui

Tweaks for forward-compatibility

2011-06-18 09:42:04 -07:00

usb

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

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

utils

am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."

2011-07-25 12:21:06 -07:00