Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades
am f27f6348: Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades

* commit 'f27f634824dcbd483a724ee05fb5d5f2bb7df01e':
  Avoid creating dialog on an activity that is finishing
Merge "Update session data properly." into ub-camera-everglades
am 96867dc1: Merge "Update session data properly." into ub-camera-everglades

* commit '96867dc15d3a7582d94450adfdd6e33bbcb4c507':
  Update session data properly.
Unify the blue button styles across the app.

  Bug: 14901436

Change-Id: I9603806a47c41896e25d2e5509a898758e82aebd
Merge "Unify the blue button styles across the app." into ub-camera-everglades
am a434d7b4: Merge "Unify the blue button styles across the app." into ub-camera-everglades

* commit 'a434d7b4d8fbbcc53616ee624482e33e12332fa9':
  Unify the blue button styles across the app.
Fix the build, we need button_cling in camera2.

Change-Id: I8150d87567ed0e8598e59a806859b00bf51b70c8
am 09f70da3: Fix the build, we need button_cling in camera2.

* commit '09f70da39bcc93a1e418243f71e248382f17854b':
  Fix the build, we need button_cling in camera2.
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
Add hooks for disabling/enable the mode options toggle between captures.

Bug: 13982230
Change-Id: Ib2582420c2f7fd0038555aed0b23bfa8f151721b
am a7919c72: Add hooks for disabling/enable the mode options toggle between captures.

* commit 'a7919c720c49d7aa9a033366a92f8b1828619a0f':
  Add hooks for disabling/enable the mode options toggle between captures.
Set a preview callback with a buffer size to force update preview callback stream

This is the workaround for the same issue that causes b/12210027. It was fixed
in KitKat MR2, so we are applying the workaround on KitKat and MR1.

Bug: 14954941
Change-Id: Ifba3f9d47769884e81a41277f858e5c7aef41803
Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades
am 05927e46: Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades

* commit '05927e466d0288a0ea971ac543f5039246875f3b':
  Set a preview callback with a buffer size to force update preview callback stream
Limit start-up screen to N4 + N5

  Bug: 15024081

Change-Id: I1333a753bc3741d176765ab026cacc1358ab2fca
Update the aspect ratio selector drawables.

  Bug: 15024081

Change-Id: Ie9d7f4079c615d9fcb4eff05eea726a9a3edc9fd
Merge "Limit start-up screen to N4 + N5" into ub-camera-everglades