Eino-Ville Talvala 706804e2e4 Merge "Add auto-white balance locking to the Camera API."

2011-05-18 08:54:40 -07:00

..

java

Merge "Add auto-white balance locking to the Camera API."

2011-05-18 08:54:40 -07:00

jni

Merge "Updates resulting from the Skia merge (revision 1327)"

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

res

resolved conflicts for merge of 22c140b7 to master

2011-05-18 09:25:49 -04:00

tests

Rename ViewRoot to ViewAncestor.

2011-05-04 14:08:11 -07:00