Reconcile with jb-mr2-release - do not merge

Change-Id: I33a0b7686aaf8e8a10c3ec222b673297ad7e76a1
am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce

* commit '8dab2ccb07e41a5b5fa9b53cc3290cb42c508978':
  Clean up comments
am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce

* commit '6f99159695f952b4e2d1d3a968354bdd3b9e4e64':
  Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce

* commit 'c241545ab013a81f4d30528c52139a7b664edf2e':
  UI cleanup
am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce

* commit 'e9af70567534c4c946347b3cfd9f005a363c5c0a':
  Fix build break.
am a4a98183: am cdea1074: Improves state/history panel behaviour

* commit 'a4a98183d17fc4d9f130819698fd6988670982ea':
  Improves state/history panel behaviour
am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation

* commit '2a20a8a21f42649a50c60636605c7d57f87d49f4':
  fix tiny planet shown after rotation
am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom

* commit 'b59417626daa9513246171b53f965a37f7273597':
  fixed vignetnette refresh during pan/zoom
am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce

* commit '4446c6619033a62980e453ece3e72bb7bc105143':
  Simplify and speed up thumbnail creation
am a28dcb04: am 6ee7feee: Visual History

* commit 'a28dcb04f4975fdc9e5ab8a5f212dd4de1b49904':
  Visual History
am 72693710: am 63b33e8c: Improves visual history

* commit '726937108a1d39b3c8ecdd7e2088ffccc7d1dd1d':
  Improves visual history
am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '62bacd5dfad22b619d2ded3b8a9680b2538869e5':
  Keep camera controls on the same physical side
am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '9a08794fcb62acde0cc1dcd09a739060d1a4ea0b':
  Add a black bar symmetric to nav bar
am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '670444be68f153511e05af6df89beeabe89313b2':
  Import translations. DO NOT MERGE
am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '2962966e5f274b77380cf5716a61aff5c1b55355':
  Import translations. DO NOT MERGE
am 38f86e40: am 8892e5e7: Fix NPE in switcher popup

* commit '38f86e402df3d99032b22eeac4578efdfa269f12':
  Fix NPE in switcher popup
am 997b0a75: am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce

* commit '997b0a7578ecbcdf89152f18611f62230d0d0411':
  fix undo bug
am 7233f395: am 8d2a3057: Fix camera switcher mode picker

* commit '7233f39558f0d80d697d3d5415ed66bf0d9a162e':
  Fix camera switcher mode picker
am 687c2a2f: am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce

* commit '687c2a2f596c39ebff119b6f6250563039c5eed0':
  Preliminary AlbumSet UI
am 9f387c22: am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce

* commit '9f387c22ac516f0f4df69034dbdafc794d08cff9':
  Add required fields to PhotoProvider.