From: Paul Rohde <codelogic@google.com>
Date: Wed, 27 May 2015 23:47:34 +0000 (+0000)
Subject: am 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala
X-Git-Tag: android-x86-6.0-r3~54
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7c4ad98a;p=android-x86%2Fpackages-apps-Camera2.git

am 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala

* commit '14d92c346e1890cf3eeb0fb9c846d834e2c59179':
  Log capture session canceled events.
---

7c4ad98a4068e88491bddfe948610e58341d7f4c