OSDN Git Service

am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
authorAngus Kong <shkong@google.com>
Thu, 11 Apr 2013 22:44:59 +0000 (15:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Apr 2013 22:44:59 +0000 (15:44 -0700)
commit115e86934c8e5b0be4b24d9e9ad9278425940838
treef3f936ce6b13911d10f8f55ac5e71ef1c8c2d39c
parent0e4ba348606517ce2bfa98e8e9b684f60bf5c36b
parent2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90
am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit '2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90':
  Integrate FilmStripView.