commit 5f8046d937213d283ebb179b7bce4a7dc0c4feb4
author Josh Gao <jmgao@google.com> Mon Apr 18 21:29:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 18 21:29:41 2016 +0000
tree e459afdef9c079207d7d9e8165c0a512dcbbdd5f
parent 371ea7cb8e8a4451288b9c8f1e813c1a567dfccb
parent 6d571a336dcd2ec8f79fb42862540370df5e9684

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

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

Change-Id: I910cd4e32bd38796025d603ee86d245d33f6c61a

adb/adb.h

diff --git a/adb/adb.h b/adb/adb.h
index 59644d4..ea20800 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -50,7 +50,7 @@
 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;