Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad
tree: a0b809960bba40da033c63e19099b361115d336e
  1. gallerycommon/
  2. jni_mosaic/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/