tree 56f89a5a26050d77ef2ccd68251b1303d8791254
parent ec501466ea78758de4e0ab8057713c697829c2ec
parent f7c6c5ad64c8e5d20e1806cc98b9919334c69614
author Eino-Ville Talvala <etalvala@google.com> 1348268758 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348268759 -0700

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