In case of conflict, reset to initial state by aborting the cherry-pick,
leaving the working directory clean

Change-Id: I2353b92254b67ea49835bc88b6fc9bc3910b5107

* Load the correct font to display the capacity in appropriate size
* Fall back to gr_sys_font() in case it can't be loaded

Change-Id: I7a05be70da3b8f0cf2895e844dfc29d66d5dbab1

France has 7 MCC codes, but only include the 2 DOM (Overseas regions) codes here.
* Metropolitan France: 208
* Guadeloupe, Martinique, Guyane: 340
* La Réunion, Mayotte, TAAF (French Southern and Antarctic Lands): 647

The 4 others MCC codes aren't covered by those number as stated on their website.
* Saint-Pierre-et-Miquelon: 308
* Wallis-et-Futuba: 543
* Nouvelle-Calédonie: 546
* Polynésie française: 547

See:
* http://www.solidaritefemmes.org/appeler-le-3919
* http://www.allo119.gouv.fr/

Change-Id: If13e2c2cfa669b76178182f9aa2d0f19772a45a3

* fixes the broken auto-detection for MasMovil Spain

Change-Id: I6fadeb3703e78d6ba6b2fe9420b9a45cd1f78de1

 * Change Ibf1370ff3cb539a9a54002a8704922744a3ca5d7 on fw/base
   added support for a security feature. This feature listens
   for multiple back button presses in succession and then
   returns the user to their home screen.

Change-Id: I5a386782ae2dcb0898491e1af48a73d6fb74a181

* Fixes Settings->User->(Crop|Take) Picture

Change-Id: I8e9d2a968e0fc566dfce3019554bf1c7e0557842

This reverts commit ee8db8f.

Change-Id: Ib1ad23043f358ec09ea9133452d4ad9b6fe0edfc

116006 - Victims of crime
116111 - Child Helplines
116123 - Emotional support helpline

overview: https://ec.europa.eu/digital-single-market/en/116-helplines
per country: https://ec.europa.eu/digital-single-market/en/116-your-country

Change-Id: I7f7eccd3dc743a164e219152f26feda17cfb1b75

Change-Id: I68388202f42b7522f3fd3965d4ce518c142e7ce3

When WITH_TWRP=true is set:
* Set recovery variant to TWRP, it should be synced
  under bootable/recovery-twrp in Lineage
* Exclude SuperSU, we have our own su solution

Change-Id: I5e5e6f2b42282c4666cdc013405a1488a9c6341d

The current assignment is wrong, we cleanup the files when we tell
not to do so.

Change-Id: I73a9a17f5ebae6f2dbdc3d6d9aaa28cd75fb4f87

…ata_file""

This reverts commit cc0d29e.

Change-Id: Ie4e1a693600627feddd0984795d0be68a34f2585

Change-Id: I5a8d195ef3b67c5ccee4e34f4ec294a880c7a083

Sometimes the need arises to update one specific subset of blobs
while holding others steady. Introduce a way to specify the "section"
of blobs to update (obviously requires the proprietary-files to be
properly split up first)

Requires additional changes in device tree extract_files.sh to support
passing the additional arguments

Change-Id: I98feab56f8bfade2818b1b5264e019440d4c57c5

Sometime blob directories are contained in dirs not named system
(ex. extracting blobs from another vendor dir) so check if the file
exists without system/ before appending "system/" to filenames.

Change-Id: I4ba946e178260b4f4804b1ac4422645e3085c665

* Allows extracting only a specific section from proprietary-files.txt
* Defaults to not cleaning vendor folder before extraction
* Adds script options rather than depending on apredefined order

Change-Id: I74cd3bf4a1f652232c97c78d6164f0730599c1a7

Currently, using project-set-path is blocking us from overriding the pathmap
for the audio, display, and media HALs, so set them with set-device-specific-path
to allow overriding the HALs with USE_DEVICE_SPECIFIC_* and DEVICE_SPECIFIC_*_PATH

Change-Id: Iee3723cf251d0f485a77a17fd61cb62178833582

Change-Id: I2a3e39ff76f78c9ad37fb2f36b9d40b7b5bf6a4d

"$3" evaluates as "" when $3 is empty, and so $# is still 3
When $3 is empty, do not use it

Change-Id: I87df7dd8ed23cac3d4cff16dce0996bbe0a3e6cc

Change-Id: I34b2aa557fc0532194423b1c04b6469ad4ead2ec

 into own-n

Signed-off-by: Hassan Sardar <hassansardar08@live.com>