tree 32e4636167d58926793042ffd0e886aa36e250d6
parent 5c2842bfb7b26afc4637277ff0aa3e0c7827cc41
parent d19b431d6d374ad981f7a3bd076e82eb155c41e6
author Nicolas Roard <nicolasroard@google.com> 1350491652 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350491652 -0700

am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches

* commit '34c807c8d89f9bfa9565ab52746d845acfb714fd':
  Added fixed aspect ratio support for cropping.