From: Jason Monk <jmonk@google.com>
Date: Tue, 11 Aug 2015 14:12:00 +0000 (+0000)
Subject: am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture... 
X-Git-Tag: android-x86-7.1-r1~1235^2~300
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138;p=android-x86%2Fpackages-apps-Settings.git

am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '31227bfaf12ede192474bb162f1555215ffa605b':
  Add setting to disable camera gesture
---

1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138