Dianne Hackborn 6b592723c9 resolved conflicts for merge of f51ded0f to master ...

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2

2011-06-10 12:45:36 -07:00

..

android_runtime

Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder.

2011-06-09 11:59:23 -07:00

binder

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

2011-04-13 10:21:56 -07:00

camera

Merge "Improve android.hardware.Camera.Area javadoc."

2011-06-07 04:05:35 -07:00

diskusage

…

drm

DO NOT MERGE

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

gui

9-axis sensor fusion with Kalman filter

2011-05-27 17:04:55 -07:00

media

Make dumpsys(media.player) more useful by having AwesomePlayer populate it.

2011-06-08 16:04:26 -07:00

pim

…

private

Remove unnecessary level of priority indirection

2011-06-01 16:46:29 -07:00

storage

…

surfaceflinger

frameworks/base: android_native_buffer_t -> ANativeWindowBuffer

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

ui

am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2

2011-06-07 17:52:30 -07:00

utils

resolved conflicts for merge of f51ded0f to master

2011-06-10 12:45:36 -07:00