From: Angus Kong <shkong@google.com>
Date: Wed, 9 Oct 2013 03:02:24 +0000 (-0700)
Subject: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent."... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~23^2~123
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7693a4f020261d20b2f48f11b842f9c095abeba5;p=android-x86%2Fpackages-apps-Camera2.git

am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad

* commit '762d8cb0c6e05af36893fd3eec9753e4f68b6c83':
  Don't go into Gcam when it's capture intent.
---

7693a4f020261d20b2f48f11b842f9c095abeba5