Dianne Hackborn aa9d84c37e resolved conflicts for merge of 05be6d6f to master ...

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

2011-05-09 19:00:59 -07:00

..

binder

Make sure binder ioctl structs don't contain uninitialized values.

2011-04-21 14:37:15 +04:00

camera

Add an auto-exposure lock feature to the Camera API.

2011-05-02 09:36:06 -07:00

diskusage

Move disk usage utilities to its own library

2010-11-30 16:51:13 -08:00

gui

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

2011-05-03 16:40:14 -07:00

hwui

Minor javadoc enhancements

2011-05-06 14:14:20 -07:00

rs

Moving samplers behind the hal.

2011-05-05 16:56:27 -07:00

storage

Add a method enable encryption.

2011-01-12 16:00:23 -06:00

surfaceflinger_client

merge libsurfaceflinger_client into libgui

2011-03-25 18:42:40 -07:00

ui

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

usb

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

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

utils

am fbb0e9f9: am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

2011-04-26 12:46:04 -07:00