tree d70b74de8ef513dd7d7f294bdefbc6c2a684f717
parent 5d1a943dc49dcb1513d64e281efb522d704dea02
parent a36f4d680a02dbf2bf2166f148f4c5200ec1d8f4
author David Pursell <dpursell@google.com> 1443456384 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443456384 +0000

am a36f4d68: Merge "adb: bump server version to prevent feature mismatch."

* commit 'a36f4d680a02dbf2bf2166f148f4c5200ec1d8f4':
  adb: bump server version to prevent feature mismatch.