| author | Robert Horvath <robhor@google.com> | 2020-01-31 16:53:15 (GMT) |
|---|---|---|
| committer | Robert Horvath <robhor@google.com> | 2020-01-31 16:53:15 (GMT) |
| commit | d4cbae7e9652d5fab3d1b21b380effd4d41180df (patch) | |
| tree | 6b247c7055a233dc6e32ce94cc476b23239c4469 | |
| parent | 6c0d674b3ff1ce558974771b8ae3ef18c5f54fdd (diff) | |
| parent | d6a58b8ccde03656b4d752d41b7fed2f0b23ee52 (diff) | |
| download | common-d4cbae7e9652d5fab3d1b21b380effd4d41180df.zip common-d4cbae7e9652d5fab3d1b21b380effd4d41180df.tar.gz common-d4cbae7e9652d5fab3d1b21b380effd4d41180df.tar.bz2 | |
resolve merge conflicts of d6a58b8ccde03656b4d752d41b7fed2f0b23ee52 to partner-master-tv-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I75d471554dcf74570bd4cc2c6475ec330b9da087
| -rwxr-xr-x | flash-all-ab.bat | 1 | ||||
| -rwxr-xr-x | flash-all-ab.sh | 1 | ||||
| -rwxr-xr-x | flash-all-dynamic.bat | 1 | ||||
| -rwxr-xr-x | flash-all-dynamic.sh | 1 | ||||
| -rwxr-xr-x | flash-all.bat | 1 | ||||
| -rwxr-xr-x | flash-all.sh | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/flash-all-ab.bat b/flash-all-ab.bat index 2030287..19d52bb 100755 --- a/flash-all-ab.bat +++ b/flash-all-ab.bat @@ -31,6 +31,7 @@ fastboot flashing unlock fastboot -w fastboot erase param fastboot erase tee +fastboot erase misc fastboot flash vbmeta vbmeta.img fastboot flash logo logo.img fastboot flash boot boot.img diff --git a/flash-all-ab.sh b/flash-all-ab.sh index 3082f84..2dc7871 100755 --- a/flash-all-ab.sh +++ b/flash-all-ab.sh @@ -67,6 +67,7 @@ fastboot $sern flashing unlock fastboot $sern -w fastboot $sern erase param fastboot $sern erase tee +fastboot $sern erase misc flash_with_retry vbmeta vbmeta.img flash_with_retry logo logo.img diff --git a/flash-all-dynamic.bat b/flash-all-dynamic.bat index d1720bc..f588f12 100755 --- a/flash-all-dynamic.bat +++ b/flash-all-dynamic.bat @@ -30,6 +30,7 @@ fastboot flashing unlock fastboot -w fastboot erase param fastboot erase tee +fastboot erase misc fastboot flash vbmeta vbmeta.img fastboot flash logo logo.img fastboot flash boot boot.img diff --git a/flash-all-dynamic.sh b/flash-all-dynamic.sh index 9cc739c..49fab80 100755 --- a/flash-all-dynamic.sh +++ b/flash-all-dynamic.sh @@ -66,6 +66,7 @@ fastboot $sern flashing unlock fastboot $sern -w fastboot $sern erase param fastboot $sern erase tee +fastboot $sern erase misc flash_with_retry vbmeta vbmeta.img flash_with_retry logo logo.img diff --git a/flash-all.bat b/flash-all.bat index ff3152a..776ca4a 100755 --- a/flash-all.bat +++ b/flash-all.bat @@ -30,6 +30,7 @@ fastboot flashing unlock fastboot -w fastboot erase param fastboot erase tee +fastboot erase misc fastboot flash vbmeta vbmeta.img fastboot flash odm odm.img fastboot flash logo logo.img diff --git a/flash-all.sh b/flash-all.sh index 5f04c24..d5e9756 100755 --- a/flash-all.sh +++ b/flash-all.sh @@ -30,6 +30,7 @@ fastboot flashing unlock fastboot -w fastboot erase param fastboot erase tee +fastboot erase misc fastboot flash vbmeta vbmeta.img fastboot flash odm odm.img fastboot flash logo logo.img |