Mathias Agopian f0b517d9d2 Merge "may fix build on some version of gcc"

2011-06-14 11:51:24 -07:00

..

android_runtime

Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.

2011-06-13 14:27:39 -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

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

SurfaceTexture: fix up a comment.

2011-06-13 10:50:13 -07:00

media

Merge "audio: update for audio/audio_policy header names/locations"

2011-06-13 19:43:59 -07:00

pim

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

private

unify SurfaceTexture and Surface

2011-06-13 15:51:35 -07:00

storage

Add a method enable encryption.

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

surfaceflinger

unify SurfaceTexture and Surface

2011-06-13 15:51:35 -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

may fix build on some version of gcc

2011-06-14 11:50:22 -07:00