Merge "Update Uri instead of removing" into gb-ub-photos-carlsbad
tree: 265e962288cbc3059c801974932a104ed4e264d2
  1. gallerycommon/
  2. jni_jpegstream/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/