tree 2bbddd8f8c19058c8069b4704e48ad246925b6bf
parent 4532c5e49cc0d029c53a3aee3e0b1fdf8ffd2ec4
parent 2447edd85baac3225a12b868ef40f76cfdc6ec11
author Ben Komalo <benkomalo@google.com> 1307726254 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1307726254 -0700

Merge "New device policy to disable camera."