From: Erin Dahlgren <edahlgren@google.com>
Date: Tue, 15 Oct 2013 19:44:49 +0000 (-0700)
Subject: am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launc... 
X-Git-Tag: android-x86-6.0-r3~68^2~27^2~45^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f983b7b3;p=android-x86%2Fpackages-apps-Camera2.git

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.
---

f983b7b3afdf30de9261f2a6d4c6a4ddb4447c84