From: Angus Kong <shkong@google.com>
Date: Tue, 24 Sep 2013 16:31:40 +0000 (-0700)
Subject: am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub... 
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~117
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee0115170c47fde80ed410d753609b7ced377f5b;p=android-x86%2Fpackages-apps-Camera2.git

am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad

* commit 'c74825b1666857cbfd0ad3750f0d509de8e86953':
  Allow user to tap on lock icon from secure camera.
---

ee0115170c47fde80ed410d753609b7ced377f5b