am 1ef34d34: am 54310d1a: Merge "Fix the wrong error message"
am 1ef34d34: am 54310d1a: Merge "Fix the wrong error message"

* commit '1ef34d3440db524d6ea2e0a6d4e72b668765d293':
  Fix the wrong error message

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build