Merge "Moving crop to a separate activity.  Refactoring." into gb-ub-photos-bryce
tree: 642d967096b69b11d5df28f95715c4a6adbed285
  1. tests/
  2. tests_camera/
  3. AndroidManifest.xml