Merge "Update CTS Verifier Versions"
diff --git a/src/compatibility/contact-us.md b/src/compatibility/contact-us.md
index 285ddca..4956a90 100644
--- a/src/compatibility/contact-us.md
+++ b/src/compatibility/contact-us.md
@@ -23,19 +23,17 @@
out of any of these options, please first read "Getting the Most from Our
Lists" on the [Community page](index.html)
-## For General Discussion ##
+## For Android Compatibility Definition and Compatibility Test Suite Technical Questions ##
+If you have questions about Android compatibility that aren't covered in this site, you can reach
+us in one of a few different ways. To get the most out of any of these options, please first read "Getting the Most from Our
+Lists" on the [Community page](index.html). If you have specific issues with the Compatibility Test Suite or the Compatibility Definition
+[android-compatibility list.](https://groups.google.com/forum/?fromgroups#!forum/android-compatibility) is the discussion forum for you.
-The preferred way to reach us is via the [compatibility@android.com](mailto:compatibility@android.com) address.
+ - Subscribe using Google Groups: [android-compatibility](https://groups.google.com/forum/?fromgroups#!forum/android-compatibility)
+ - Subscribe via email: [android-building](mailto:android-compatibility+subscribe@googlegroups.com)
-## For CTS Technical Questions ##
-
-If you have specific issues with the Compatibility Test Suite that require
-you to disclose information you'd prefer not to be public, you can contact an
-email address we've set up specifically this purpose: [cts@android.com](mailto:cts@android.com). This email address is for
-cases that require disclosure of confidential information only, so general
-questions will be directed back to the public android-compatibility
-list. Note also that this list is for specific technical questions; general
-inquiries will also be directed back to the [android-compatibility list.](https://groups.google.com/forum/?fromgroups#!forum/android-compatibility)
+Note that if you're a user looking for help with your Android device, this page probably isn't for you;
+you should contact your carrier or manufacturer for help with your Android device.
## For Business Inquiries ##
diff --git a/src/source/building-devices.md b/src/source/building-devices.md
index 18055ba..936cb27 100644
--- a/src/source/building-devices.md
+++ b/src/source/building-devices.md
@@ -27,8 +27,6 @@
All configurations of Nexus 10 can be used. On those devices, graphics, audio,
Wi-Fi, Bluetooth, camera, NFC, GPS and orientation sensors are functional.
-Nexus 4 cannot be used at the moment.
-
The Wi-Fi variants of Nexus 7 can be used. On Nexus 7, graphics and audio are
functional, as well as Wi-Fi and Bluetooth. Due to hardware differences, do
not use 4.1.1 on a Nexus 7 that was originally sold with 4.1.2 or newer.
@@ -81,7 +79,6 @@
Device | Keys
---------|------
manta | Press and hold both *Volume Up* and *Volume Down*, then press and hold *Power*
-mako | Press and hold *Volume Down*, then press and hold *Power*
grouper | Press *Power* for a second, and press *Volume Down* when the bootloader logo appears
tilapia | Press *Power* for a second, and press *Volume Down* when the bootloader logo appears
phantasm | Power the device, cover it with one hand after the LEDs light up and until they turn red
@@ -131,7 +128,7 @@
from pure source code only, and requires additional hardware-related proprietary
libraries to run, specifically for hardware graphics acceleration.
-Official binaries for Nexus S, Nexus S 4G, Galaxy Nexus, Nexus 7, Nexus 4,
+Official binaries for Nexus S, Nexus S 4G, Galaxy Nexus, Nexus 7,
Nexus 10 and PandaBoard
can be downloaded from
[Google's Nexus driver page](https://developers.google.com/android/nexus/drivers),
@@ -205,7 +202,6 @@
Factory images
for Nexus 10,
-for Nexus 4,
for Nexus Q,
for Nexus 7 (all variants),
for Galaxy Nexus (GSM/HSPA+ "yakju" and "takju",
diff --git a/src/source/initializing.md b/src/source/initializing.md
index cad530a..8e5bafb 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -156,9 +156,9 @@
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e42", MODE="0600", OWNER="<username>"
# fastboot protocol on grouper/tilapia (Nexus 7)
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e40", MODE="0600", OWNER="<username>"
- # adb protocol on mako/manta (Nexus 4, Nexus 10)
+ # adb protocol on manta (Nexus 10)
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4ee2", MODE="0600", OWNER="<username>"
- # fastboot protocol on mako/manta (Nexus 4, Nexus 10)
+ # fastboot protocol on manta (Nexus 10)
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4ee0", MODE="0600", OWNER="<username>"
Those new rules take effect the next time a device is plugged in.
