am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."

* commit 'c01231b399c38f00afe0872b3a51837518b713dc':
  Always include the adb version in the log.