Jeff Hamilton e3db3d6209 Merge commit '525f953b' into manualmerge ...

Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7

2011-01-09 21:01:56 -06:00

..

config

…

java

Merge commit '525f953b' into manualmerge

2011-01-09 21:01:56 -06:00

jni

Enable camera preview to a SurfaceTexture.

2011-01-07 17:40:24 -08:00

res

Better documentation for FLAG_HARDWARE_ACCELERATED

2011-01-09 16:45:28 -08:00

tests

Merge "Fix check for required features" into honeycomb

2011-01-09 07:15:26 -08:00