Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev

author Ian Pedowitz <ijpedowitz@google.com>

Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)
author Ian Pedowitz <ijpedowitz@google.com>
Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)
diff --cc Android.mk
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Ian Pedowitz <ijpedowitz@google.com>
	Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history