commit 3acc325289da36a9e7b19fa21cf6074c310827dd
author Jaikumar Ganesh <jaikumar@google.com> Fri Sep 10 11:30:19 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 10 11:30:19 2010 -0700
tree 83e793125bcab7bd0777318be2d7fe3a817b66dc
parent 23bb4577b721bc77aba8416cb73f94fb38074bca
parent 3cd1a1440d74cc31be247f0bd967a432d26042ac

am 3cd1a144: Set line discipline to HCI_UART_H4 even for low power mode.

Merge commit '3cd1a1440d74cc31be247f0bd967a432d26042ac'

* commit '3cd1a1440d74cc31be247f0bd967a432d26042ac':
  Set line discipline to HCI_UART_H4 even for low power mode.

data/Android.mk

diff --git a/data/Android.mk b/data/Android.mk
index 0e289c4..4034de1 100644
--- a/data/Android.mk
+++ b/data/Android.mk
@@ -20,6 +20,7 @@
 
 files := \
 	audio.conf \
+	network.conf \
 	input.conf \
 	main.conf \
 	blacklist.conf \

data/network.conf

diff --git a/data/network.conf b/data/network.conf
new file mode 100644
index 0000000..5f11639
--- /dev/null
+++ b/data/network.conf
@@ -0,0 +1,6 @@
+# Configuration file for the network service
+
+[General]
+
+# Disable link encryption: default=false
+#DisableSecurity=true