OSDN Git Service

am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub...
authorAngus Kong <shkong@google.com>
Thu, 11 Apr 2013 22:52:49 +0000 (15:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Apr 2013 22:52:49 +0000 (15:52 -0700)
commit527af0df9587f04bea16735949a37fbe8d356462
tree920e3c6d351513caa9d131f00eb862186e859548
parent49bdc9ddb8035b4e0218cc002062ecb2302cf090
parenta3c16e5b3e1b1e45b622cc012a3a0e6d0cbcc41d
am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit 'a3c16e5b3e1b1e45b622cc012a3a0e6d0cbcc41d':
  Integrate FilmStripView.