Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
am d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce

* commit 'd52594cf7993e156491a806ade65b6f85e639b20':
  Fix bug in exposure setting
Sharing support for albums, bulk operations infrastructure

Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
am 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce

* commit '730685b2b4c286d32d97f92283d12254df284f0c':
  Add coarse grained events for camera mode, filmstrip stats
Horizontal scrollable filmstrip view.

Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce
am f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce

* commit 'f069751e1adcb85ce14934b7a275f1276f5490a8':
  Sharing support for albums, bulk operations infrastructure
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
am 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce

* commit '215bb750dcb21e449227acb3cdf76da3cb6173a2':
  Horizontal scrollable filmstrip view.
size tweak

Change-Id: I2153774ef05f67b313f86c4552ccd0471fae1f6e
Merge "size tweak" into gb-ub-photos-bryce
am 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce

* commit '8cc88f0320a4b62f8256fb33faebf0f75cf172e0':
  size tweak
am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce

* commit 'd15e43fb5295ae0cf6af45663043d603e2e181ba':
  Fix Monkey NPE
Use Model-View-Controller pattern on video module

Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
Exif parser modifications.

Bug: 8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
am 6e6a5243: Exif parser modifications.

* commit '6e6a524390d8ddebce5de0dcc8ae258e652ec80a':
  Exif parser modifications.
Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
am 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce

* commit '5bedc41eb4bf30fe277de3977db8331f970c8f0b':
  Use Model-View-Controller pattern on video module
Fix photo editor RS allocation on orientation change.

Bug: 8383050
Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1