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

========

https://hg.mozilla.org/integration/gaia-1_4/rev/2012b6593c36
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #17935 from davidflanagan/camera-uplift

Camera uplift

========

https://hg.mozilla.org/integration/gaia-1_4/rev/3808929dcb46
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 990630: extract the EXIF preview metadata that media frame needs

don't parse EXIF again when creating thumbnail

Diego's README changes

update tests
(cherry picked from commit 54c5d48f9b6fb955de8608f9b4c85e8356ae04c3)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/e9182df4a644
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 987609 - [Camera][Madai][UX] Gallery/preview Image number should be visible when swiping
(cherry picked from commit ce2947cf822c1f4a1f44d0da19bdae18c81ed69d)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/bde80acdd320
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 991090 - [Camera] Options is not localizable
(cherry picked from commit 6c0115848169ac41105b91ee23b49b9ae2808c7b)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/060d4df66a95
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 988632 - [Camera][Madai] More frequent instances of "Picture not saved" when tapping shutter button
(cherry picked from commit 684f6ef9ccbf87c1b76a3bd9791af114de3967e6)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/597203d3431c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 990255 - [Camera][Mozilla] 1.4 Zoom bar and indicators are too close to each other when rotated 180
(cherry picked from commit 3692a79945dfbd173d96cf52179019338ec2fbb5)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/5b8cb15aa5f1
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988108 - [camera][madai] capitalization corrections
(cherry picked from commit 9d4b6612e5886be7a818d99a20b5751e1887eff5)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/0ed1d57123f0
Author: verchaswa.sharma <verchaswa.sharma@lge.com>
Desc: [Bug 989023][Camera][Madai][Mozilla]Image Preview button needs highlight state
(cherry picked from commit 9f7ce7210f0eaef139f5939c4b6cbed3f9112949)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/42f08bba4e84
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 990653 - [Camera] Update unit tests for Activities
(cherry picked from commit eb87371bc015d1b1b43f5cfa858b7f9248482e26)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/fd6099cf3293
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 988610 - [Camera][Madai] Black screen when opening camera from lockscreen and camera app isn't open
(cherry picked from commit a88b33784f12d2680c9835c80993eb67e66367da)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/9a61c3e2c756
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: Bug 990404 - [Camera] Can click the hidden gallery/thumbnail button during the recording
(cherry picked from commit 8e2032eda00abea96ad46bfa1fdc13865e95e452)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/c39c3228ebe7
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 990285 - [Camera] Resolutions should not be shown in settings menu
(cherry picked from commit b65e6574811623440bd19d783cbc81d9e7678e4a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/9598bf2c0e18
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rounded
(cherry picked from commit 23601af541fc156a2013fb7b353f7bcc2a30092f)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/dcfd3557e52f
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 987058 - [Camera] Expose higher resolution recorder profiles
(cherry picked from commit 3c966ebe058348e0d308c913abff0888297c38f8)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/99a9181b2c92
Author: askeing <askeing@gmail.com>
Desc: Bug 989247 - modify the gaiatest camera app for gaia camera change
(cherry picked from commit e47218a18a53de875e56c5406d27955071066b3a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/9c31a5c46dd5
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active state
(cherry picked from commit 0ef855ca162de5aa65930ce7a735e0f704a25409)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/fdf02cb699dd
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 989283 - [Camera] [Madai] Indicators are difficult to see on dark background
(cherry picked from commit 7021be5eeb7669b9e22e727cb2b6e03cc768d2c6)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/036beecca65f
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988519 - [Camera] Improve localization
(cherry picked from commit f7d18ad98cf5f8be7befbb1822f78dd97ebb3c3f)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/84fbe658d936
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: Bug 987607 - [Camera][Madai] Gallery/Preview the UI takes too long to appear
(cherry picked from commit 2b5825836d041986f17b05919c85e1a69a45edcb)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/46ba8c34b031
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 989295 - [Camera] Fix SettingsController test breaking TBPL
(cherry picked from commit 36465a7804df252aea21b652924a9db3787496cb)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/c8db091a8552
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 972137 - [Camera] 1.4 Visual Design Settings Menu
(cherry picked from commit d9e5ef612a61a18496c3ad969f3442b3de9fe945)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/df4b737be03b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985680 - [Camera][Mozilla][UX] 1.4 Video record active button style not to spec
(cherry picked from commit 41b987a135fbe425fb7ca23c9e32bf31b81fea41)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/4e9e5c80cffd
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 975597 - [B2G][Camera] Connecting to a PC with USB storage enabled while recording a video will cause the media apps to be disabled
(cherry picked from commit 3490d7c00bbf5d0c18aa5398c0c38b1bcb058853)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b13cb816d732
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988441 - [Camera][Madai][Mozilla][UX] 1.4 Image Preview text should match confirmation text
(cherry picked from commit ae8753be4cbd993857777edfc0c6448021c4ffc1)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/8a879a234fe3
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988484 - [Camera] HUD blinks on startup
(cherry picked from commit 1dfc2f3257638d712723b341dcc9a400db81c674)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f644ef930fc1
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985578 - [Camera] [Madai] [Mozilla][UX] Self-Timer not to spec
(cherry picked from commit 4d3904ddc4f977b4cbc53aba191e6f00bcdf687a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/9ee7b848482d
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 948263 - [User Story] Warning when the battery is low while recording a video
(cherry picked from commit ef3ff847a5e21a4663a563eacd8b5501ee10571c)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/855e2ca9197f
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988287 - [CAMERA][MADAI] HUD is receiving click events when it is invisible state
(cherry picked from commit 9db6d4483f2c513f7497352c9817a2d494a2ca9d)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b744041f5e98
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986763 - [Camera][Madai] Very short video not saved.
(cherry picked from commit 01ba5fae7e22fdac5b6ceb56633c61b28f593962)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b0288547103d
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 988118 - Gaia unit test failures on TBPL due to the camera merge
(cherry picked from commit 7c0d5d0c1047bd0edae92d685aef91d235a6143a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/286c872a2d94
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 988010: increase maxBuffer size for multilocale build tests
(cherry picked from commit ae87d4a118a2aef23bd2ace3a5b8959ec8a880fc)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/848c80dcf29e
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 987825: remove build tests for camera
(cherry picked from commit dce30bdcd444c0267ad681740a318e5d0cdf3109)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/5ef9ad9a11ba
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail
(cherry picked from commit b7161f8d4e8895c623f1f1d186231a11ff74d937)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/e4e8d0a2ce04
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]
(cherry picked from commit 63428d3af8d8aeb25af6b649b578a8124dc16983)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/5d2919d67481
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
(cherry picked from commit 689812b9c5d5004775f9dfe2360e95f4118cdd5a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/82951a51d4c0
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985058 - [Camera] [Mozilla][UX] 1.4 Viewfinder Assets not to spec
(cherry picked from commit ad296a9512517db639d25a3c7b17ee85cf02ab57)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/2b2df56228dd
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.
(cherry picked from commit 807ab29660a7fcbd89a3368bbef688c5e8896ea5)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/de7a5b7ad962
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)
(cherry picked from commit 97142f420435b6fd73b2a00cc00080f076d08b37)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/be28f536bbef
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
(cherry picked from commit c688805f329b3bc99a7a55d331cbc20d2e1d5442)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/621f3c3d91c3
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 986217 - [Camera] Fade viewfinder on picture capture
(cherry picked from commit cec58a35bc7e3c8d36efb87bf2f1f335aee2b91f)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/ffd89dc9128d
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985092 - [Camera][Madai][Mozilla][UX] 1.4 Indicators look like buttons
(cherry picked from commit 2c9bee03b54f8219eb2d5342603b77bc7d0d2ae3)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/8007640bc257
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 986849 - image pick activity displays useless mode switch button
(cherry picked from commit e9ff38d93b617c3fbc1403048815a663ad3ca58a)

========

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

This reverts commit 2a1a6ab9304cc0d9b93695b9f3ce32fe71fe5813.
(cherry picked from commit 403c6a1560924426f0f03916041e9e58ef50e56a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/fe70ca38ac9d
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)
(cherry picked from commit c9ad7fa12b9f1a9b46bd8e4888c2def55e0f701f)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/6eeff71fdb6a
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.
(cherry picked from commit 5de123cc04fd9b0945b125e5678ac56db2ce078f)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/7eef83543cff
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)
(cherry picked from commit 7919f6e31444e8ae25bb1ed4fdbd45484cbeed84)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/195277425907
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986276 - [Camera] [Madai] Indicator should disappear when recording video
(cherry picked from commit 2ae0de2134df122ac7fd4cee691e34994e5809e0)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/763102e1c578
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985662 - [Camera][Madai][Mozilla] 1.4 Video recording counter is in wrong position
(cherry picked from commit 2e6bdb69bf750036db1740f8db6474e8e8325e9a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/985d6bf46720
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 965145 - [Camera] refactor .sensorAngle patch in bug 947956 for new camera app
(cherry picked from commit b6a7d5a9edbdbbdfe5126132c965146fe0a4a714)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/a3677bb84ebd
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 978531 - [Camera][Madai] The preview is not available when reopening the camera
(cherry picked from commit 023a08d943e49d0fc1f367ae02aade625c180f38)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/e40f82dcac28
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986120 - [Camera][Mozilla][Madai][UX] 1.4 Gallery Grid Icon shifts when changing orientation
(cherry picked from commit 9dfc0e07fd24d21ed0fd2e9d0d5d0ec622b6bb50)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/30b503aefb93
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 986266 - zoom control slider is shown on UI
(cherry picked from commit 8d6532f561badaab3f7a4db3f2a5610a1eed40db)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/28fa7f682ae7
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985077 - [Camera][Madai] Unable to take picture against dark surface with flash turned off
(cherry picked from commit e67fe6775d55a0101b446428a3270f4e2cad7d79)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/fdc2d2dd24b4
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 982071 - Unusable Camera app when triggered from pick activity for file upload
(cherry picked from commit e9bacd5ec84e27f2f2f740edb19c8743f465685d)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f56d7d295133
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985236 - [camera][madai] Zoom bar jumps on orientation
(cherry picked from commit 8ac4d0c5cc8495fb1996e6454828a9f02200d8a1)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/60b9e33103c6
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 984616 - [Camera][Madai] Short videos don't get saved. Less than a second
(cherry picked from commit 8f34442cfec04740bb916be5cb2d7e4f3bae1599)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/d68aad1bbb26
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 984730 - Camcorder starts with flash light by default
(cherry picked from commit 75eae09cd57ca14ee39f8634ee49c029b6069cf5)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/3e7987d0002b
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
(cherry picked from commit cc82a25bc4d4fd5025df33904a175afe36cb8351)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/c90dcabbe371
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 985602 - [Camera][Madai] Premature start of self-timer when taking pictures back-to-back
(cherry picked from commit d7cf22067d48f5c03699017a62a36ad3e719ef79)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f8b6cd27e749
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: bug 984719- hide gallery/thumbnail button during the recording
(cherry picked from commit d69ed6fe948488849ec045d6d372703af7c16b0e)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/8f873eb02e2c
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 984632 - [Camera] Zoom slider too close from the capture buttons on landscape orientation
(cherry picked from commit 877c1b501e84d5fa2e44a6a6aef81e06157803dd)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f1022c1c7885
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985016 - [B2G][Camera] Z-Index of Zoom Bar is incorrect
(cherry picked from commit 02577212936ffe106edf46f6c4af40664b0baa25)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/3598ae46fa29
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984764 - [camera] Beep Sounds When self-timer reaches 3~1
(cherry picked from commit a44d5f4e4406266854598357cf8aaa27c5a039bd)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/9d4415c224d7
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984769 - [Camera] Self-Timer orientation change
(cherry picked from commit 9346520c8c5ce03ee695c3385f8a5f43c666d3be)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/c0489f6162dc
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 984625 - [Camera] I cannot clear the self timer
(cherry picked from commit 2c04a5105c84132e51341e8697d99110210b2e64)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/305a2f03a560
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976852 - [Camera] Indicator Icons On camera Preview for Important camera settings
(cherry picked from commit 58fcee6884569ccebe61f40efc28e1abb170b83c)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/33b7063d21e9
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.
(cherry picked from commit 205c05210040f75afcd2b30382630d35cfc62cb0)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/88d869089e21
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976852 - [Camera] Indicator Icons On camera Preview for Important camera settings
(cherry picked from commit d7a3febf120e48d1c54cf85171306eb758b27987)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/d55cf1ca4ec6
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport
(cherry picked from commit 7c1d83a6419e419e5fe90859b3d2375c690dbc44)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f075e43c30c4
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.
(cherry picked from commit e650d273da70fb6545586c0ac25d5210f60fccad)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/edeb10c00f86
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport
(cherry picked from commit cc2ed4b3ba99fbc98c47c3b9d44367b46c0cdb4f)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f9643e278738
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 933902 - [Camera] 1.4 Add zoom functionality
(cherry picked from commit 108fa692f79887a09ef9bb4c251c5375edbe6ded)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/5fde1558dea4
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966837 - [User story] Add self-timer to camera settings
(cherry picked from commit 02dd942ed8e44ac49271266b91872fb91cc19214)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b0a535687036
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
(cherry picked from commit bb05cf7a7200b87d1ff871b11adef39e1938d066)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/0dd410498097
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966835 - [User story] Add HDR to camera settings
(cherry picked from commit 29439b4e467f317da8bec9d9d94789eeded7ccd4)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/d3eef33747d0
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 971086 - [Camera] 1.4 Visual Design - Image Capture/ Video Buttons
(cherry picked from commit e9e248a84a9dc6fe446190ec3ffe6e896ae51def)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/24a4a8316586
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966834 - [User story] Add white balance support in camera
(cherry picked from commit 57b69023a5b05db885f58afbbf9d7e4e8b5b56d1)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/27dcbadbdf37
Author: ashish.singh <ashish.singh@lge.com>
Desc: [Camera] ISo implementation
(cherry picked from commit 4f2f572af80d25b622fb90c412fbce71fee96a38)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/d78b216e56a5
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Merge pull request #16956 from wilsonpage/bug/979285"
(cherry picked from commit ecb1f5889c6fb732233e8c6d881fed720041319a)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/74bf9be87167
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport
(cherry picked from commit 3ab129187a574373161b04755fd9d46f5d539740)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/cd4ce9cd29a0
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979289 - [Camera] Make settings menu fullscreen
(cherry picked from commit fc35804da270914adc3935f19bc5d7c4ed38753d)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/561aa67e8cd4
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976406 - [Camera] Fade viewfinder when switching between modes
(cherry picked from commit 0c96dbd1ae2a79a1fdf975118f37e429bf626ac8)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/03649b151a95
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976203 - [Camera] Localization (l10n) missing from settings UI
(cherry picked from commit 9da6b516809161d7a16895f00b8aa08ac03cfba2)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/692629ba799d
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976203 - [Camera] Localization (l10n) missing from settings UI
(cherry picked from commit 93bd6d661e325990ba40963011cc45814409c79c)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/0c46c7bc21c2
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 966839 - [Camera] Add frame grid to camera settings
(cherry picked from commit 7fe64a4838e3f07e9f129bac1905d5eb4fcd0920)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b037fb6b39bc
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably
(cherry picked from commit 2bca3e9afcbd6bb8fcdbac942817e917b1a3a6c7)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/68e0253b1d4c
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 980094 - [Camera] Moving setter and enabler methods from controls view to the view base class
(cherry picked from commit cf999a587818b1341a99ae6f6dc566bdd7afe14c)

========

https://hg.mozilla.org/integration/gaia-1_4/rev/6b3e022e154b
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 980599 - [Camera] Picture and video resolution selection
(cherry picked from commit 7ca934f21b7e2ea027b7bb3ceb36d37c74072b5b)
Bumping manifests a=b2g-bump