Merge "adb: bump the server version to 36." am: 3009b7c

am: a0b5c62

* commit 'a0b5c62525e7b79131df337619b268794c92374f':
  adb: bump the server version to 36.

Change-Id: I910cd4e32bd38796025d603ee86d245d33f6c61a
This commit is contained in:
Josh Gao 2016-04-18 21:29:41 +00:00 committed by android-build-merger
commit e929e115be

View file

@ -50,7 +50,7 @@ constexpr size_t MAX_PAYLOAD = MAX_PAYLOAD_V2;
std::string adb_version();
// Increment this when we want to force users to start a new adb server.
#define ADB_SERVER_VERSION 35
#define ADB_SERVER_VERSION 36
class atransport;
struct usb_handle;