Dianne Hackborn 161e67ff3b resolved conflicts for merge of 06a8ceac to master ...

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

2011-05-19 21:44:52 -07:00

..

binder

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

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

camera

Add auto-white balance locking to the Camera API.

2011-05-17 10:52:42 -07:00

diskusage

Move disk usage utilities to its own library

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

gui

Disable error report temporarily to enable inline video

2011-05-18 14:37:51 -07:00

hwui

Updates resulting from the Skia merge (revision 1327)

2011-05-16 15:30:40 -04:00

rs

Move context and device creation out of the spec file.

2011-05-18 17:40:34 -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

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -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 06a8ceac to master

2011-05-19 21:44:52 -07:00