tree 6bc51de8653220863ee6a32dc7fdf8009d5b5f14
parent 988af0861e5bb973b0593fbb19a8c357ae1c11e0
parent 6d77ad80375a82b97aefb7d5ab547a2944135edf
author Katie McCormick <kmccormick@google.com> 1320406456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320406456 +0000

am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info.

* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf':
  Doc change: Updating device-admin with camera info.