tree 50355f2a1064757a37e3132dfe8c88c8bd68a47a
parent de12d6a669df152960390caafc791830096a7f56
parent 72dfc3814578769bbe1317a8cd62180e63ac8e3d
author John Hoford <hoford@google.com> 1381536458 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381536458 -0700

am 72dfc381: am dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

* commit '72dfc3814578769bbe1317a8cd62180e63ac8e3d':
  fix showing wrong image post save