tree 8890134faaa1d42cb7b45d844b6a81d47cefd88f
parent 277fd9adf7ad7240dc8114b7d4cdbf91ec770bd9
parent f6ab64affe8cbd1ab8c163635faa557be58a207a
author Daniel Sandler <dsandler@google.com> 1299265671 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299265671 -0800

am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1

* commit 'f6ab64affe8cbd1ab8c163635faa557be58a207a':
  Restore CAMERA permission to ApiDemos.