tree 93b9cc28ce580a2ac2406645a62ea47f57cfeaba
parent 8a5ef7c4379d0d13aebd27a193c3a9094b10b92f
parent 33c5d45c0c8710574d5193b5dc7984ac21a4df75
author Jeff Brown <jeffbrown@google.com> 1351110821 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351110821 -0700

am 33c5d45c: am ea7dfba7: Merge "Add ApiDemos for secure surfaces." into jb-mr1-dev

* commit '33c5d45c0c8710574d5193b5dc7984ac21a4df75':
  Add ApiDemos for secure surfaces.