Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 418632f5 authored by Tao Bao's avatar Tao Bao
Browse files

resolved conflicts for merge of 50827e0d to mnc-dr-dev-plus-aosp 

Change-Id: I88f94e520f59a381f441de9d4bad158b6c7045c4
parents f06a2d3b 50827e0d

tools/releasetools/ota_from_target_files.py

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ OPTIONS.oem_source = None 
OPTIONS.fallback_to_full = True

OPTIONS.full_radio = False

OPTIONS.full_bootloader = False

# Stash size cannot exceed cache_size * threshold.

OPTIONS.cache_size = None

OPTIONS.stash_threshold = 0.8





def MostPopularKey(d, default):

tools/releasetools/rangelib.py

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ class RangeSet(object): 
  lots of runs."""



  def __init__(self, data=None):

    # TODO(tbao): monotonic is broken when passing in a tuple.

    self.monotonic = False

    if isinstance(data, str):

      self._parse_internal(data)