From: Bobby Georgescu <georgescu@google.com>
Date: Tue, 28 May 2013 17:15:02 +0000 (-0700)
Subject: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~8^2^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=562414813ab2dd8ca0df4149d12c588e12101d00;p=android-x86%2Fpackages-apps-Camera2.git

am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
  Prevent lock screen appearing during active slideshow
---

562414813ab2dd8ca0df4149d12c588e12101d00