OSDN Git Service

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

* commit 'bdb3578486870647fe24d8bae74eaed552d6527b':
  Integrate FilmStripView.