tree 28c8a0c6fda7a46acf1e39b25f58253843f71ee1
parent 6feecf0337c7b242cf052b297f03522dfd2f0fbe
parent 25d31c9f9cfcf5a868e0280db6221e64517b8af1
author Jerry Zhang <zhangjerry@google.com> 1526593695 -0700
committer android-build-merger <android-build-merger@google.com> 1526593695 -0700

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

Change-Id: Id2d80584075c3482748e5946d39fe8ef572aea45