From: John Hoford <hoford@google.com>
Date: Thu, 12 Sep 2013 21:29:46 +0000 (-0700)
Subject: am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-7.1-r1~114^2~144
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1844b200;p=android-x86%2Fpackages-apps-Gallery2.git

am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad

* commit '759740717fc8ae3515a50196e40417b27ca59089':
  fix Edit from filmstrip bug
---

1844b200986e4e69455d25d9304b44ed04073379