summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-04-01 19:38:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-01 19:38:27 +0000
commitbacc4a7efb3f33214f4a71a50c0492f469974cb4 (patch)
treecba74da8c5bf72ac07fbeb8005dff7fc3a4cefd9 /docs/html
parentd959a3d31c7ef866fa870a79bffce94d02026199 (diff)
parentf80749c5c52de0609e27da216b7c6daf8e23a34a (diff)
downloadframeworks_base-bacc4a7efb3f33214f4a71a50c0492f469974cb4.zip
frameworks_base-bacc4a7efb3f33214f4a71a50c0492f469974cb4.tar.gz
frameworks_base-bacc4a7efb3f33214f4a71a50c0492f469974cb4.tar.bz2
am f80749c5: am c3796073: am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs
* commit 'f80749c5c52de0609e27da216b7c6daf8e23a34a': laptop image with redacted
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/wear/images/laptop-bridge.pngbin238742 -> 252319 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/wear/images/laptop-bridge.png b/docs/html/wear/images/laptop-bridge.png
index b481224..083b82b 100644
--- a/docs/html/wear/images/laptop-bridge.png
+++ b/docs/html/wear/images/laptop-bridge.png
Binary files differ