From: ztenghui <ztenghui@google.com>
Date: Thu, 3 Oct 2013 22:41:04 +0000 (-0700)
Subject: am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~185
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44c32d1710482fd45aacfd077d206ad2de1df588;p=android-x86%2Fpackages-apps-Camera2.git

am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '27408847ed867399fed01515848d3cd93a4d343f':
  Only show delete action when in secure camera mode.
---

44c32d1710482fd45aacfd077d206ad2de1df588