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
tree: 2a94c9ebb108258ec055de40bab7af2fc8086eaf
  1. jni_mosaic/
  2. res/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/