tree f32368d5ec02ef7552d3b4d6b82be711d5cbbdc8
parent 5e07d4fc1a03fcad526d0718ceab11a99f7f8698
parent 177c4b05ed8e9f71afc526e5cad339f245563450
author Erin Dahlgren <edahlgren@google.com> 1381866289 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381866289 -0700

am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad

* commit '177c4b05ed8e9f71afc526e5cad339f245563450':
  Do not show any bottom controls in secure camera to prevent launching out of app behavior.