am 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce

* commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a':
  Remove new camera activity code from Bryce
1 file changed
tree: 032ec05e777e6a42a02bbd7f2fbbfafcb7e391bc
  1. tests/
  2. tests_camera/
  3. AndroidManifest.xml