diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-10-01 17:21:08 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-10-01 17:21:08 -0700 |
commit | e819834ea17380042bf767c457e89dad24ff4aa2 (patch) | |
tree | 08baab4aca15e5b070ff909f951c4f53f4dae873 /clear-factory-images-variables.sh | |
parent | a65846cce3812184074cbbbfe2fa721142f549ac (diff) | |
parent | 8422277e4c07a3fa77947805a977af321779512b (diff) | |
download | android_device_common-e819834ea17380042bf767c457e89dad24ff4aa2.tar.gz android_device_common-e819834ea17380042bf767c457e89dad24ff4aa2.tar.bz2 android_device_common-e819834ea17380042bf767c457e89dad24ff4aa2.zip |
resolved conflicts for merge of 8422277e to master
Change-Id: Ic32740bb257916035b23b6e8e88efdbce5da19d6
Diffstat (limited to 'clear-factory-images-variables.sh')
-rw-r--r-- | clear-factory-images-variables.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clear-factory-images-variables.sh b/clear-factory-images-variables.sh index 50c438f..154244d 100644 --- a/clear-factory-images-variables.sh +++ b/clear-factory-images-variables.sh @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +unset XLOADER +unset XLOADERSRC unset BOOTLOADER unset BOOTLOADERFILE unset BOOTLOADERSRC |