tree 28c8a0c6fda7a46acf1e39b25f58253843f71ee1
parent f4ade1caa2ac9d0336004f80328c75fe137f713b
parent 901fb2c8113461fe1468bd79998c24f95b848f03
author Jerry Zhang <zhangjerry@google.com> 1526593968 -0700
committer android-build-merger <android-build-merger@google.com> 1526593968 -0700

Merge "recovery: Reset optind to 1 after getopt" am: 38d90316b2 am: 25d31c9f9c
am: 901fb2c811

Change-Id: I8848adc74153293256f780fefaa05c579eda359d