summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-06-24 21:42:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-24 18:00:13 +0000
commit5f036fb80bac5da7578cefaecdb62457e0067368 (patch)
tree99fdcb33851a633b11af42611a31e777bd6cb2ff
parent5f5610caf5a0154630cb900c3c28ae8acf591ce3 (diff)
parentb52a91ea324729b678f9a6819a0a68841158ee20 (diff)
downloadframeworks_base-5f036fb80bac5da7578cefaecdb62457e0067368.zip
frameworks_base-5f036fb80bac5da7578cefaecdb62457e0067368.tar.gz
frameworks_base-5f036fb80bac5da7578cefaecdb62457e0067368.tar.bz2
Merge "docs: ad dnew hero, remove arm" into klp-modular-dev
-rw-r--r--docs/html/wear/images/hero.jpgbin248879 -> 443273 bytes
-rw-r--r--docs/html/wear/images/partners/arm.pngbin2711 -> 0 bytes
-rw-r--r--docs/html/wear/index.jd3
3 files changed, 0 insertions, 3 deletions
diff --git a/docs/html/wear/images/hero.jpg b/docs/html/wear/images/hero.jpg
index 7850a81..0b4debb 100644
--- a/docs/html/wear/images/hero.jpg
+++ b/docs/html/wear/images/hero.jpg
Binary files differ
diff --git a/docs/html/wear/images/partners/arm.png b/docs/html/wear/images/partners/arm.png
deleted file mode 100644
index 27214d1..0000000
--- a/docs/html/wear/images/partners/arm.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index d4cab41..bc08aa0 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -227,9 +227,6 @@ page.type=about
<div class="col-4">
<img src="/wear/images/partners/samsung.png" alt="Samsung">
</div>
- <div class="col-4">
- <img src="/wear/images/partners/arm.png" alt="ARM">
- </div>
</div>
</div> <!-- end .wrap -->
</div>