tree eebf6ff059ed02f7a3679ef2403537db13725205
parent 1420dea329586ad491ea93a90a59d0d78b28d953
parent 3b7347daf572c20996607afe4cc32f9a96f8fe5d
author John Reck <jreck@google.com> 1368745163 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368745163 -0700

am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
  Switch back to old crop