resolved conflicts for a1fcaf86 to mnc-dr-dev

Change-Id: Ie53652faa530a3c9c83f30c8f2b636d90f0f1b7a

diff --cc tools/releasetools/ota_from_target_files.py
index 25e3724,b148fc1..e5a30ad
--- 1/tools/releasetools/ota_from_target_files.py
--- 2/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@@ -125,11 -127,8 +130,11 @@@ OPTIONS.updater_binary = Non
  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):
    """Given a dict, return the key corresponding to the largest
    value.  Returns 'default' if the dict is empty."""