From: Doris Liu <tianliu@google.com>
Date: Thu, 28 Mar 2013 16:54:02 +0000 (-0700)
Subject: am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed... 
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~13^2~311
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cfa17c541caaf9fba0667b41eb2cc1f683f6fbba;p=android-x86%2Fpackages-apps-Camera2.git

am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce

* commit '30edf57559cd46e7cdb191a61fd2138bf6ead905':
  Disable preview gestures when shutter is pressed
---

cfa17c541caaf9fba0667b41eb2cc1f683f6fbba