tree da84419e159cffa2c060e4142281913de627302a
parent 51062cdba038e0f0315aa14749267210cad3913a
parent 0406de14d023918f4cdb3c928b6c2f3f67abf9e5
author Elliott Hughes <enh@google.com> 1446570037 +0000
committer android-build-merger <android-build-merger@google.com> 1446570037 +0000

Merge "Fix fastboot to cope with hammerhead\'s implicit hex." am: 2b7b3bd100 am: 4ca547be67
am: 0406de14d0

* commit '0406de14d023918f4cdb3c928b6c2f3f67abf9e5':
  Fix fastboot to cope with hammerhead's implicit hex.