summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuan Nguyen <luann@google.com>2015-03-09 18:03:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-09 18:03:19 +0000
commita05634ffd99dad2225435f5907735c7afdfec10c (patch)
tree646027b6c193c6da3a993d71c426691461314643
parent535bf0f8e5034a9a21755df6cf158a4b95e857aa (diff)
parent408800c3aca72d150dacb646d0a455b248fc3db0 (diff)
downloadframeworks_base-a05634ffd99dad2225435f5907735c7afdfec10c.zip
frameworks_base-a05634ffd99dad2225435f5907735c7afdfec10c.tar.gz
frameworks_base-a05634ffd99dad2225435f5907735c7afdfec10c.tar.bz2
am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '408800c3aca72d150dacb646d0a455b248fc3db0': docs: Add new partners to Wear index page
-rw-r--r--docs/html/wear/images/partners/acer.pngbin0 -> 1860 bytes
-rw-r--r--docs/html/wear/images/partners/arm.pngbin0 -> 1922 bytes
-rw-r--r--docs/html/wear/images/partners/huawei.pngbin0 -> 5856 bytes
-rw-r--r--docs/html/wear/index.jd9
4 files changed, 9 insertions, 0 deletions
diff --git a/docs/html/wear/images/partners/acer.png b/docs/html/wear/images/partners/acer.png
new file mode 100644
index 0000000..439de80
--- /dev/null
+++ b/docs/html/wear/images/partners/acer.png
Binary files differ
diff --git a/docs/html/wear/images/partners/arm.png b/docs/html/wear/images/partners/arm.png
new file mode 100644
index 0000000..3e2f642
--- /dev/null
+++ b/docs/html/wear/images/partners/arm.png
Binary files differ
diff --git a/docs/html/wear/images/partners/huawei.png b/docs/html/wear/images/partners/huawei.png
new file mode 100644
index 0000000..9099ed4
--- /dev/null
+++ b/docs/html/wear/images/partners/huawei.png
Binary files differ
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index 27e8098..316f5ca 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -202,6 +202,12 @@ page.type=about
<div class="landing-partners cols">
<div class="col-4">
+ <img src="/wear/images/partners/acer.png" alt="Acer">
+ </div>
+ <div class="col-4">
+ <img src="/wear/images/partners/arm.png" alt="ARM">
+ </div>
+ <div class="col-4">
<img src="/wear/images/partners/asus.png" alt="Asus">
</div>
<div class="col-4">
@@ -214,6 +220,9 @@ page.type=about
<img src="/wear/images/partners/htc.png" alt="HTC">
</div>
<div class="col-4">
+ <img src="/wear/images/partners/huawei.png" alt="Huawei">
+ </div>
+ <div class="col-4">
<img src="/wear/images/partners/intel.png" alt="Intel">
</div>
<div class="col-4">