From: Angus Kong <shkong@google.com>
Date: Thu, 11 Apr 2013 22:52:49 +0000 (-0700)
Subject: am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub... 
X-Git-Tag: android-x86-7.1-r1~458^2~222^2~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=527af0df9587f04bea16735949a37fbe8d356462;p=android-x86%2Fpackages-apps-Gallery2.git

am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit 'a3c16e5b3e1b1e45b622cc012a3a0e6d0cbcc41d':
  Integrate FilmStripView.
---

527af0df9587f04bea16735949a37fbe8d356462