tree 43ae1fec694e74499f09f859f25cc486696355ad
parent eb3885d69255dbb8880d2518fff750997b7025cf
parent 0fd3c4a1e2716afdf2a1459abf0bdb76f1c3ddf0
author Mike Lockwood <lockwood@android.com> 1298943964 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1298943964 -0800

Merge "CameraBrowser: Add USB device filter meta-data for digital cameras"