commit b5a0dc0bd11cad143790d73b11ebad3564ff0b26
author The Android Automerger <android-build@android.com> Mon Aug 15 06:35:07 2011 -0700
committer The Android Automerger <android-build@android.com> Mon Aug 15 06:35:07 2011 -0700
tree d9e8dd1c2b26f75e41d5d20ec0634795f700634c
parent 594b77a493c44186af3d6f6a6bc7b30babcb2896
parent 2e6842e43e67a12a98e3e75ecb77cfa17c2bb028

merge in ics-release history after reset to master

data/main.nonsmartphone.conf

diff --git a/data/main.nonsmartphone.conf b/data/main.nonsmartphone.conf
index fa853f3..c73bbd8 100644
--- a/data/main.nonsmartphone.conf
+++ b/data/main.nonsmartphone.conf
@@ -16,8 +16,8 @@
 # Local device class
 #     0x0a0000  - Service class: Capturing (Microphone) + Networking
 #     0x000100  - Major class: Computer
-#     0x00000C  - Minor class: Laptop
-Class = 0x0a0010C
+#     0x000010  - Minor class: Handheld
+Class = 0x0a0110
 
 # How long to stay in discoverable mode before going back to non-discoverable
 # The value is in seconds. Default is 180, i.e. 3 minutes.

data/main.nonsmartphone.le.conf

diff --git a/data/main.nonsmartphone.le.conf b/data/main.nonsmartphone.le.conf
index 5d334c2..fe56d0b 100644
--- a/data/main.nonsmartphone.le.conf
+++ b/data/main.nonsmartphone.le.conf
@@ -16,8 +16,8 @@
 # Local device class
 #     0x0a0000  - Service class: Capturing (Microphone) + Networking
 #     0x000100  - Major class: Computer
-#     0x00000C  - Minor class: Laptop
-Class = 0x0a0010C
+#     0x00000C  - Minor class: Handheld
+Class = 0x0a0110
 
 # How long to stay in discoverable mode before going back to non-discoverable
 # The value is in seconds. Default is 180, i.e. 3 minutes.