tree e5963feed73d63a0266ba36a0c79524faf7d1ec0
parent 2a88de414efddfe2813dea1fbe121f915e3bd07a
parent ce54df0c34bd0d8472e2c1fea4da1e0a9d8fd657
author John Reck <jreck@google.com> 1368745132 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368745132 -0700

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

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