OSDN Git Service

am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad
authorJohn Hoford <hoford@google.com>
Thu, 12 Sep 2013 21:29:46 +0000 (14:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Sep 2013 21:29:46 +0000 (14:29 -0700)
* commit '759740717fc8ae3515a50196e40417b27ca59089':
  fix Edit from filmstrip bug


Trivial merge