Eino-Ville Talvala 901e022c0c Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera."

2011-07-14 13:38:55 -07:00

..

java

Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera."

2011-07-14 13:38:55 -07:00

jni

Force bitmaps to load in ARGB8888 by default.

2011-07-14 12:42:19 -07:00

res

Merge "Rationalize API after adding maximum size feature."

2011-07-14 11:32:09 -07:00

tests

resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

2011-07-13 12:29:57 -07:00