commit 6d571a336dcd2ec8f79fb42862540370df5e9684
author Josh Gao <jmgao@google.com> Mon Apr 18 20:14:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 18 20:14:39 2016 +0000
tree 6e9c7184fff1527215dae312570e3eee211255db
parent 395ba9c33702fe24dd85cb1d73fd3da93ec114ef
parent 3204898835c6b4f9bc495b4e50a766adf9998d30

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

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

Change-Id: I60a8d01fa2da411d1417d186bb93941ceed33418

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;