Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
diff --git a/docs/html/support.jd b/docs/html/support.jd
index 94d6478..0d87961 100644
--- a/docs/html/support.jd
+++ b/docs/html/support.jd
@@ -1,8 +1,7 @@
-page.title=Developer Support
+page.title=Developer Support Resources
page.type=about
fullpage=1
-page.metaDescription=Resources available to help you report and resolve issues while you are developing apps for Android.
-page.image=/images/android-support-card.png
+page.metaDescription=Links to community and support resources for Android developers.
@jd:body
@@ -42,8 +41,6 @@
<p>
<a href="http://code.google.com/p/android/issues/entry?template=Developer%20Documentation">
Report documentation bug</a><br />
- <a href="https://code.google.com/p/android/issues/entry?template=User%20bug%20report">
- Report device bug</a><br />
<a href="https://code.google.com/p/android/issues/entry?template=Developer%20bug%20report">
Report platform bug</a><br />
</p>