OSDN Git Service

am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
authorAngus Kong <shkong@google.com>
Thu, 11 Apr 2013 22:45:03 +0000 (15:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Apr 2013 22:45:03 +0000 (15:45 -0700)
* commit '2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90':
  Integrate FilmStripView.


Trivial merge