diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-08-01 09:57:43 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-01 09:57:43 -0700 |
commit | dbb52b537084304b22ba616c398d656838af2c22 (patch) | |
tree | f539b7ffe87ffe6c2f801d308e93a83c1721bad6 | |
parent | 623cc2fd7f99b7cc21439328795d98e87fbcd08e (diff) | |
parent | 8099c00e9e31ebc00c0101ebdf070691fefe7120 (diff) | |
download | source.android.com-dbb52b537084304b22ba616c398d656838af2c22.tar.gz |
Merge "Remove the empty tech sections"
-rw-r--r-- | src/tech/bluetooth/index.md | 23 | ||||
-rw-r--r-- | src/tech/index.md | 18 | ||||
-rw-r--r-- | src/tech/nfc/index.md | 25 | ||||
-rw-r--r-- | src/tech/sidebar.md | 2 |
4 files changed, 0 insertions, 68 deletions
diff --git a/src/tech/bluetooth/index.md b/src/tech/bluetooth/index.md deleted file mode 100644 index 2f5d4594..00000000 --- a/src/tech/bluetooth/index.md +++ /dev/null @@ -1,23 +0,0 @@ -<!-- - Copyright 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -# Bluetooth Technical Information # -*Placeholder* - -The Android Open-Source Project includes a bluetooth subsystem currently based -on the upstream bluez project. Android then layers various IPC and similar -libraries to link the bluez library with the Android Bluetooth stack and API. - diff --git a/src/tech/index.md b/src/tech/index.md index cdcaac07..9bf5867d 100644 --- a/src/tech/index.md +++ b/src/tech/index.md @@ -30,24 +30,6 @@ design information on the VM itself, and so on. [» Dalvik Information](/tech/dalvik/index.html) -## Bluetooth Technical Information ## -The Android Open-Source Project includes a bluetooth subsystem currently based -on the upstream bluez project. Android then layers various IPC and similar -libraries to link the bluez library with the Android Bluetooth stack and API. - -[» Bluetooth Information](/tech/bluetooth/index.html) - - -## NFC Technical Information ## -The Android Open-Source Project also includes an NFC implementation. Unlike -the Android Bluetooth stack, much of the Android NFC stack is new code -originally contributed to the Android Open-Source Project. This code links the -Android NFC API to a device's NFC hardware. This section also includes -information on related Android technologies, such as the simple NDEF Push -Protocol. - -[» NFC Information](/tech/nfc/index.html) - ## Encryption Technical Information ## The Android Open-Source Project includes the ability to encrypt the user's data. This document is written for 3rd parties developing Android devices who want to diff --git a/src/tech/nfc/index.md b/src/tech/nfc/index.md deleted file mode 100644 index 94a41dd9..00000000 --- a/src/tech/nfc/index.md +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - Copyright 2010 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -# NFC Technical Information # -*Placeholder* - -The Android Open-Source Project also includes an NFC implementation. Unlike -the Android Bluetooth stack, much of the Android NFC stack is new code -originally contributed to the Android Open-Source Project. This code links the -Android NFC API to a device's NFC hardware. This section also includes -information on related Android technologies, such as the simple NDEF Push -Protocol. diff --git a/src/tech/sidebar.md b/src/tech/sidebar.md index d1d6dbb9..b770eb8b 100644 --- a/src/tech/sidebar.md +++ b/src/tech/sidebar.md @@ -1,5 +1,3 @@ # Topics # -- [Bluetooth](/tech/bluetooth/index.html) - [Dalvik](/tech/dalvik/index.html) - [Encryption](/tech/encryption/index.html) -- [NFC](/tech/nfc/index.html) |