Eino-Ville Talvala 3723396c7a Merge "Add an auto-exposure lock feature to the Camera API."

2011-05-03 11:07:33 -07:00

..

java

Merge "Add an auto-exposure lock feature to the Camera API."

2011-05-03 11:07:33 -07:00

jni

Merge "Allows to render with an OpenGL context inside a TextureView."

2011-05-02 18:33:26 -07:00

res

Merge "Import revised translations."

2011-05-03 10:57:54 -07:00

tests

resolved conflicts for merge of db46fa25 to master

2011-05-02 14:41:57 -07:00