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

* commit 'efc8077246a3e816957a774f3d272b909c1c1b12':
This commit is contained in:
Elliott Hughes 2015-08-27 11:52:19 +00:00 committed by Android Git Automerger
commit 9c43d4d79f

Diff content is not available