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)
commit1844b200986e4e69455d25d9304b44ed04073379
tree3c8dceaecb8003caa107a3a71dc0d823b9c01599
parentbef578192b63f954b4f1044e59dc6d050e861017
parent759740717fc8ae3515a50196e40417b27ca59089
am 75974071: am eb6a9b9c: Merge "fix Edit from filmstrip bug" into gb-ub-photos-carlsbad

* commit '759740717fc8ae3515a50196e40417b27ca59089':
  fix Edit from filmstrip bug