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

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

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

..

android_runtime

Replace a custom AndroidRuntime::findClass with a more targeted fix.

2011-04-13 16:43:15 -07:00

binder

Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)

2011-04-13 10:21:56 -07: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

drm

DO NOT MERGE

2011-05-13 15:09:24 -07:00

gui

fix onFrameAvailable

2011-05-11 18:01:51 -07:00

media

am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

2011-05-18 09:30:01 -07:00

pim

…

private

remove last traces of copybit

2011-05-02 16:27:21 -07:00

storage

Add a method enable encryption.

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

surfaceflinger

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

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

ui

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -07:00

utils

resolved conflicts for merge of 06a8ceac to master

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