Reconcile with klp-release - do not merge

Change-Id: I7342697cd26413fe5da3528afca689e91a070c59
am d0a780dc: am 92ae10ec: Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. Thi

* commit 'd0a780dc82847b9007d0c8e3e6fdef010aba6598':
  Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077.
am 690eba37: am 0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad

* commit '690eba378d7526a54a7cbab253fdaebb036ebc39':
  Make current view center in filmstrip.
am a6e1f342: am 7e1c5fe2: Single tap to full screen mode.

* commit 'a6e1f342792995c1e231cae286d7fca5ecd12b69':
  Single tap to full screen mode.
am 18aafe57: am fca1c5ec: Defining broadcast intent strings as constants in CameraUtil.java. For now I\'m leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the d

* commit '18aafe5738dcfd051a8e5514ed987de4ed66da7a':
  Defining broadcast intent strings as constants in CameraUtil.java. For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java.
am ac87189c: am 29a27c76: Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad

* commit 'ac87189cf64a3abf222a837dad055fac21eb1c56':
  Brings back the details menu with most EXIF data in it. Some are still missing and will come back later.
am e14044ee: am fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.

* commit 'e14044ee6b5123bc842d8f315c2d3a30c4cfe4ac':
  Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
am 81d517a4: am 394023fb: Single-tap in fullscreen view toggles ActionBar.

* commit '81d517a45937eaae4ea574bc7995860fd6f7cafc':
  Single-tap in fullscreen view toggles ActionBar.
am 9e06215e: am 4ff5a1ab: Set views in filmstrip invisible when alpha = 0.

* commit '9e06215e7c90d2867c406ff0a45d39ff9c5e1d81':
  Set views in filmstrip invisible when alpha = 0.
am 34a3b7fb: am 856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad

* commit '34a3b7fb968c07ff6e8a4420a285de86b43cd7b8':
  Add back intent-filter for default category and main action.
am c5541a55: am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad

* commit 'c5541a555c185a3ea665003eb085f7778028412e':
  Add image 1:1 support
am 1a7fed5f: am 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad

* commit '1a7fed5fdf84a3c796f50739b2f2842111b099fd':
  Add the trim functionality back to FilmStripView
am 2c9dc8eb: am 88ef7664: Bring back the bottom controls in Filmstrip.

* commit '2c9dc8eb28dcb508855002b0643526824fd51eb4':
  Bring back the bottom controls in Filmstrip.
am b030d20d: am 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad

* commit 'b030d20df5f95ab5078fefc77bb59138d45b0605':
  Enable switching cameras in video mode.
am 119bd7ec: am e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad

* commit '119bd7ecb7724fae56989f92bb4b8f143bbfc5e0':
  Don't refresh item on resume as it leads to a filmstrip bug.
am 397586f0: am 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad

* commit '397586f086023ff3906cfcd5d3defd1b630af379':
  Update the action bar style to match Bryce
am 32ba33c6: am b0a5929b: Add video details to the details menu

* commit '32ba33c6b1f4735df00e57013a2fe0971defdc66':
  Add video details to the details menu
am 49ab978a: am b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad

* commit '49ab978ac5ee1d7188fefa18a5ebce1a016d2386':
  Implement deletion in the menu.
am cf43f817: am 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'.

* commit 'cf43f817a0aff70ee126eb3c669584ef79824786':
  Rename accessibility text for Photo Sphere mode from 'new panorama'.
am 9fd5ee8a: am 0819304b: Add "set as" capability in Film Strip

* commit '9fd5ee8aae5f7aca69c65245007a10fe672422d7':
  Add "set as" capability in Film Strip