am 9c43d4d7: am efc80772: (-s ours) am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."

* commit '9c43d4d79fd425c2ef4b8a8ba462d8e715996036':