Index: head/devel/android-tools-adb-devel/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/Makefile	(revision 399202)
+++ head/devel/android-tools-adb-devel/Makefile	(revision 399203)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-1280
-DISTVERSIONSUFFIX=	-g659f5ade04a5
-PORTREVISION=	1
+DISTVERSION=	m-preview-4374
+DISTVERSIONSUFFIX=	-gf83766079e24
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-adb
 DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 OPTIONS_DEFINE=	TEST_PYTHON
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_PROJECT=	platform_development:development
-TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-66-ge4cded6:development
+TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-2091-g6d49ceb:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 TEST_PYTHON_USES=	python:2.7,build
 
 pre-install-TEST_PYTHON-on:
 # XXX python tests may leave behind running adb server
 # test_adb.py remains in core repository for some reason
 	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
 		PYTHONPATH=${WRKSRC_development}/python-packages \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py
 	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
 		PYTHONPATH=${WRKSRC_development}/python-packages \
 		${PYTHON_CMD} ${WRKSRC_development}/python-packages/adb/test_device.py
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-adb-devel/distinfo
===================================================================
--- head/devel/android-tools-adb-devel/distinfo	(revision 399202)
+++ head/devel/android-tools-adb-devel/distinfo	(revision 399203)
@@ -1,6 +1,6 @@
 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198
-SHA256 (android-platform_system_core-android-m-preview-1280-g659f5ade04a5_GH0.tar.gz) = c81510ca16a001d2399ef5674d07e4099bde9e1542d872bbd69a55078490fb22
-SIZE (android-platform_system_core-android-m-preview-1280-g659f5ade04a5_GH0.tar.gz) = 1361908
-SHA256 (android-platform_development-android-m-preview-66-ge4cded6_GH0.tar.gz) = 5bdb269a4afd5f4b581ec317d3faae7336ea947e9c2ae4c9cf5e07c4c9ad9c1c
-SIZE (android-platform_development-android-m-preview-66-ge4cded6_GH0.tar.gz) = 126343719
+SHA256 (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 099ad3bfb625a52665562291bd822955695046e4c5d68b7f6d5fd39e265a1efd
+SIZE (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 1365538
+SHA256 (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = ea74221301367e0f8788cfca585a015c930aa98a5fded23caaed762bafcd3a2f
+SIZE (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = 126184363
Index: head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp
===================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp	(revision 399202)
+++ head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp	(nonexistent)
@@ -1,20 +0,0 @@
-Likely fails for the same reason as on OS X.
-
-  [ RUN      ] LocalSocketTest.close_with_no_events_installed
-  socket_test.cpp:36: Failure
-  Value of: fdevent_installed_count()
-    Actual: 2
-  Expected: 1u
-  Which is: 1
-
---- adb/socket_test.cpp.orig	2015-09-17 22:58:36 UTC
-+++ adb/socket_test.cpp
-@@ -277,7 +277,7 @@ static void CloseNoEventsThreadFunc(Clos
- // This test successes on linux but fails on mac because of different implementation of
- // poll(). I think the function tested here is useful to make adb server more stable on
- // linux.
--TEST_F(LocalSocketTest, close_with_no_events_installed) {
-+TEST_F(LocalSocketTest, DISABLED_close_with_no_events_installed) {
-     int socket_fd[2];
-     ASSERT_EQ(0, adb_socketpair(socket_fd));
- 

Property changes on: head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property