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)
* commit 'bdb3578486870647fe24d8bae74eaed552d6527b':
  Integrate FilmStripView.


Trivial merge