From: Erin Dahlgren <edahlgren@google.com>
Date: Fri, 8 Nov 2013 17:31:35 +0000 (-0800)
Subject: am dffe3cb6: am f41109d8: am 98254270: Merge "Make image editor intent general."... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=718da285;p=android-x86%2Fpackages-apps-Camera2.git

am dffe3cb6: am f41109d8: am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad

* commit 'dffe3cb681048e2a29c9da331dc0180a730232f8':
  Make image editor intent general.
---

718da2850e443f6df9ebc1fef19344dcfe7cb412