Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d1276095f679
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17587 from mcav/clock-timeout-master

Bug 986753 - [Tarako] Alarm Clock can get killed in the background. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/050120528940
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring.
Bumping manifests a=b2g-bump
Bumping gaia.json for 61 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ee552bd27ac8
Author: Marshall Culpepper <marshall.law@gmail.com>
Desc: Merge pull request #17466 from marshall/ftuPing

Bug 969101: Initial implementation of a first-time use ping

========

https://hg.mozilla.org/integration/gaia-central/rev/16fdd6627b0f
Author: Marshall Culpepper <marshall@mozilla.com>
Desc: Bug 969101: Initial implementation of a first-time use ping. r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/8a98181be088
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17599 from dmarcos/camera-new-features-master

Camera new features master

========

https://hg.mozilla.org/integration/gaia-central/rev/a4fb26c4ca1c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 988010: increase maxBuffer size for multilocale build tests

========

https://hg.mozilla.org/integration/gaia-central/rev/7ac861087197
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail

========

https://hg.mozilla.org/integration/gaia-central/rev/dfaa13ab2cfe
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 987825: remove build tests for camera

========

https://hg.mozilla.org/integration/gaia-central/rev/67d8a461d3ab
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 971070: implement preview gallery for Camera app [hyunacho] r=djf,jdarcangelo

resolve merge conflicts [djf]

simplify thumbnail creation code [djf]

fix error in storage library [djf]

Fixed unit tests for Bug 971090 [jdarcangelo]
(cherry picked from commit 9ae9b275beca6f17d2f31bf638b9e384d8260376)

change event in confirm controller and cleanup in preview controller [hyunacho]
(cherry picked from commit 06bd371196c81125aa9974684a93ac9cc8d69016)

fix confirm controller test [djf]

fix review nits [djf]

when discarding state on blur in secure mode, also erase thumbnail [djf]

========

https://hg.mozilla.org/integration/gaia-central/rev/cc10092b9da6
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 985012 - [Camera][Madai] Control buttons are disabled when we change from Video mode to camera mode and take a picture

========

https://hg.mozilla.org/integration/gaia-central/rev/289dae3e1702
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985058 - [Camera] [Mozilla][UX] 1.4 Viewfinder Assets not to spec

========

https://hg.mozilla.org/integration/gaia-central/rev/360a249a7ea9
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Bug 985012 - [Camera][Madai] Control buttons are disabled when we change from Video mode to camera mode and take a picture"

This reverts commit 7e41934ab5c851f7a5ae22f89ae93db71e806a9d.

========

https://hg.mozilla.org/integration/gaia-central/rev/4edad78b0e97
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)

========

https://hg.mozilla.org/integration/gaia-central/rev/720ad454a91b
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 985012 - [Camera][Madai] Control buttons are disabled when we change from Video mode to camera mode and take a picture

========

https://hg.mozilla.org/integration/gaia-central/rev/a83dd30fa4f6
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 986217 - [Camera] Fade viewfinder on picture capture

========

https://hg.mozilla.org/integration/gaia-central/rev/8793eb51cbcf
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985092 - [Camera][Madai][Mozilla][UX] 1.4 Indicators look like buttons

========

https://hg.mozilla.org/integration/gaia-central/rev/e07d26bb6d3c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 986849 - image pick activity displays useless mode switch button

========

https://hg.mozilla.org/integration/gaia-central/rev/31a6b0579a2e
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)"

This reverts commit 2a1a6ab9304cc0d9b93695b9f3ce32fe71fe5813.

========

https://hg.mozilla.org/integration/gaia-central/rev/45fcc30c9922
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)

========

https://hg.mozilla.org/integration/gaia-central/rev/6933fa00a0c3
Author: Wilson Page <wilsonpage@me.com>
Desc: Revert "Merge pull request #17280 from singhashish1887/bug984772_HDRIndicator"

This reverts commit 83242d8e2420e9c6a875150880ec421b3c5a360e, reversing
changes made to ad5a232980e427830fe272198052b858110960ba.

========

https://hg.mozilla.org/integration/gaia-central/rev/41d485015b82
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)

========

https://hg.mozilla.org/integration/gaia-central/rev/527d23a0e9f4
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986276 - [Camera] [Madai] Indicator should disappear when recording video

========

https://hg.mozilla.org/integration/gaia-central/rev/5cf41e31ed07
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985662 - [Camera][Madai][Mozilla] 1.4 Video recording counter is in wrong position

========

https://hg.mozilla.org/integration/gaia-central/rev/9d53d1efe69c
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 965145 - [Camera] refactor .sensorAngle patch in bug 947956 for new camera app

========

https://hg.mozilla.org/integration/gaia-central/rev/56bc05193c89
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 978531 - [Camera][Madai] The preview is not available when reopening the camera

========

https://hg.mozilla.org/integration/gaia-central/rev/f4226d32b5b8
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986120 - [Camera][Mozilla][Madai][UX] 1.4 Gallery Grid Icon shifts when changing orientation

========

https://hg.mozilla.org/integration/gaia-central/rev/81d57e947881
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 986266 - zoom control slider is shown on UI

========

https://hg.mozilla.org/integration/gaia-central/rev/7e786246b259
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985077 - [Camera][Madai] Unable to take picture against dark surface with flash turned off

========

https://hg.mozilla.org/integration/gaia-central/rev/9d21cc7bfe95
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 982071 - Unusable Camera app when triggered from pick activity for file upload

========

https://hg.mozilla.org/integration/gaia-central/rev/dac8c1583824
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985236 - [camera][madai] Zoom bar jumps on orientation

========

https://hg.mozilla.org/integration/gaia-central/rev/ff06cf2b452a
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 984616 - [Camera][Madai] Short videos don't get saved. Less than a second

========

https://hg.mozilla.org/integration/gaia-central/rev/143938cac7c8
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 984730 - Camcorder starts with flash light by default

========

https://hg.mozilla.org/integration/gaia-central/rev/9b04b86dfb6b
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 949941 - [Camera] Replace all memory-backed Blob instances with disk-backed File instances after saving to disk so "pick" activity consumers don't break. r=djf
(cherry picked from commit f23f21bc3837fa0726a97575c3efed33371751fc)

Conflicts:

	apps/camera/js/controllers/camera.js

========

https://hg.mozilla.org/integration/gaia-central/rev/55168f81af95
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 985602 - [Camera][Madai] Premature start of self-timer when taking pictures back-to-back

========

https://hg.mozilla.org/integration/gaia-central/rev/30b5b532f8b9
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: bug 984719- hide gallery/thumbnail button during the recording

========

https://hg.mozilla.org/integration/gaia-central/rev/56b981190695
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 984632 - [Camera] Zoom slider too close from the capture buttons on landscape orientation

========

https://hg.mozilla.org/integration/gaia-central/rev/3d9dc2583db9
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985016 - [B2G][Camera] Z-Index of Zoom Bar is incorrect

========

https://hg.mozilla.org/integration/gaia-central/rev/5023bc6a4868
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984764 - [camera] Beep Sounds When self-timer reaches 3~1

========

https://hg.mozilla.org/integration/gaia-central/rev/77828885dd12
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984769 - [Camera] Self-Timer orientation change

========

https://hg.mozilla.org/integration/gaia-central/rev/f359ebfc7fe4
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 984625 - [Camera] I cannot clear the self timer

========

https://hg.mozilla.org/integration/gaia-central/rev/07117463bf6c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976852 - [Camera] Indicator Icons On camera Preview for Important camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/50cbe7367125
Author: Wilson Page <wilsonpage@me.com>
Desc: Revert "Merge pull request #17168 from wilsonpage/bug/976852"

This reverts commit df82d12baeba31072da5aa2e4450ab9cd895e5ab, reversing
changes made to 6317b0f2902c2121703cc870018ef6683937e33d.

========

https://hg.mozilla.org/integration/gaia-central/rev/c31a36527b6b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976852 - [Camera] Indicator Icons On camera Preview for Important camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/a2eba553ba88
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport

========

https://hg.mozilla.org/integration/gaia-central/rev/0d1369197266
Author: Wilson Page <wilsonpage@me.com>
Desc: Revert "Merge pull request #17243 from wilsonpage/bug/979285"

This reverts commit ed794d89721e1798177babd6001d57cb15754021, reversing
changes made to 2f9d1662770a2f2edf5a6dc697ab81ff48ecaa9e.

========

https://hg.mozilla.org/integration/gaia-central/rev/c27715aa7137
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport

========

https://hg.mozilla.org/integration/gaia-central/rev/91769c1d8812
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 933902 - [Camera] 1.4 Add zoom functionality

========

https://hg.mozilla.org/integration/gaia-central/rev/ae6fadd0b0d2
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966837 - [User story] Add self-timer to camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/4f1ee15efe9b
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 983705 - [Camera][Madai][Buri] Camera Preview is not working on Qualcomm QRD device due to preview size anomalies

========

https://hg.mozilla.org/integration/gaia-central/rev/340f676403eb
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966835 - [User story] Add HDR to camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/a65ef881ac92
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 971086 - [Camera] 1.4 Visual Design - Image Capture/ Video Buttons

========

https://hg.mozilla.org/integration/gaia-central/rev/619ff71519c5
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966834 - [User story] Add white balance support in camera

========

https://hg.mozilla.org/integration/gaia-central/rev/a4ff380ff12f
Author: ashish.singh <ashish.singh@lge.com>
Desc: [Camera] ISo implementation

========

https://hg.mozilla.org/integration/gaia-central/rev/2188458bbf2c
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Merge pull request #16956 from wilsonpage/bug/979285"

========

https://hg.mozilla.org/integration/gaia-central/rev/046cd653d638
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport

========

https://hg.mozilla.org/integration/gaia-central/rev/560993aaeb3a
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979289 - [Camera] Make settings menu fullscreen

========

https://hg.mozilla.org/integration/gaia-central/rev/ab6003d28a02
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976406 - [Camera] Fade viewfinder when switching between modes

========

https://hg.mozilla.org/integration/gaia-central/rev/4719b0e51dca
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976203 - [Camera] Localization (l10n) missing from settings UI

========

https://hg.mozilla.org/integration/gaia-central/rev/2a34458a550c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976203 - [Camera] Localization (l10n) missing from settings UI

========

https://hg.mozilla.org/integration/gaia-central/rev/24c95526f96c
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 966839 - [Camera] Add frame grid to camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/1839e16887f1
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably

========

https://hg.mozilla.org/integration/gaia-central/rev/87df384f5b01
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 980094 - [Camera] Moving setter and enabler methods from controls view to the view base class

========

https://hg.mozilla.org/integration/gaia-central/rev/4d64f5ea25ca
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 980599 - [Camera] Picture and video resolution selection
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b0f637d0bdb9
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x

Bug 985112 - Fix marionette-client@1.1.x

========

https://hg.mozilla.org/integration/gaia-central/rev/c7e83b807320
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 985112 - Fix marionette-client@1.1.x
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2cc445d3e8f4
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17601 from eeejay/bug-987389

Bug 987389 - [Clock] Make time picker for timer accessible. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/0655d62e7c02
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 987389 - [Clock] Make time picker for timer accessible.
Bumping manifests a=b2g-bump
Bug 986933 - Add DeallocGrallocBuffer() r=nical
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/094113b3fe20
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17466 from marshall/ftuPing" for breaking gaia-unit tests on TBPL

This reverts commit 732a35447c7da220578fc21e10fe119c2552d662, reversing
changes made to 2f48cfaf3dcc1732c57dbc0706819e9359d79fce.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/86b2389af4a4
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #17572 from steveck-chung/bug-986465

Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo. r=borja

========

https://hg.mozilla.org/integration/gaia-central/rev/c85b4c5c3a72
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo
Bumping manifests a=b2g-bump
Bug 957241 - Don't package the full sdk when we don't need it. r=gps
Merge m-c to b2g-inbound despite the CLOSED TREE
Bumping gaia.json for 8 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4476a9df53ab
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17571 from RudyLu/keyboard/Bug983012_master

Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/9cade1438d30
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
disable after switching the keyboard as pinyin.
 - Remove the touchmove event listeners from the touched keys when
   switching layouts.

========

https://hg.mozilla.org/integration/gaia-central/rev/d3885fb8715c
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17600 from zacc/bug_987847

Bug 987847 - Debug test_settings_wallpaper.py

========

https://hg.mozilla.org/integration/gaia-central/rev/19e8381a68ca
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable

========

https://hg.mozilla.org/integration/gaia-central/rev/791c8ca23c3c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17619 from KevinGrandon/revert_camera_features

Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

========

https://hg.mozilla.org/integration/gaia-central/rev/d64c49a74f0c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

This reverts commit 2f48cfaf3dcc1732c57dbc0706819e9359d79fce, reversing
changes made to ede2b2488f467a0b8bddf5a741e07464cd15f735.

========

https://hg.mozilla.org/integration/gaia-central/rev/e5cddba3a31a
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17615 from gaye/backout-marionette-client-bump

Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionett...

========

https://hg.mozilla.org/integration/gaia-central/rev/a6dfca16d815
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x"

This reverts commit d19a7fb3efa74c479be7f0b24f030e9895eb4b7a, reversing
changes made to 732a35447c7da220578fc21e10fe119c2552d662.
Bumping manifests a=b2g-bump
Bug 982491 - Group apps in activities chains in the same process r=cervantes,gene
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/04670a88b75f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17562 from crh0716/974253_v2

Bug 974253 - Set preferred network type on startup based on the user preference r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/91262c8a4d8c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 974253 - Set preferred network type on startup based on the user preference
Bumping manifests a=b2g-bump