Eino-Ville Talvala a91c9f9f7a Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev

2012-09-23 10:14:22 -07:00

..

java

Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev

2012-09-23 10:14:22 -07:00

jni

Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev

2012-09-21 16:05:59 -07:00

res

Import translations. DO NOT MERGE

2012-09-22 12:50:22 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00