Merge "Consistently use - rather than _ in fastboot option tab completion."
am: 52cd10fed6

Change-Id: I22381670a6133e347bb8278c6311cc08ded867f3