summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-12-02 15:49:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-02 15:49:27 -0800
commit3e0d5a964f59ef847dbaed6bdd03034352869105 (patch)
tree173dd1844016173657d73b23a162cf8ff4dd76fb /docs/html/guide
parent0458fbd200c9a0f4e4414f67976aa56cdcb639ab (diff)
parent525bfe896b8638d20e6d7a362fd089ef8e316d4a (diff)
downloadframeworks_base-3e0d5a964f59ef847dbaed6bdd03034352869105.zip
frameworks_base-3e0d5a964f59ef847dbaed6bdd03034352869105.tar.gz
frameworks_base-3e0d5a964f59ef847dbaed6bdd03034352869105.tar.bz2
am 525bfe89: Merge change I9fb53a9c into eclair
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-plus-aosp * commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a': add screenshots for the Bluetooth Chat sample app
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/samples/images/BluetoothChat1.pngbin0 -> 16064 bytes
-rw-r--r--docs/html/guide/samples/images/BluetoothChat2.pngbin0 -> 15678 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/guide/samples/images/BluetoothChat1.png b/docs/html/guide/samples/images/BluetoothChat1.png
new file mode 100644
index 0000000..f87da6a
--- /dev/null
+++ b/docs/html/guide/samples/images/BluetoothChat1.png
Binary files differ
diff --git a/docs/html/guide/samples/images/BluetoothChat2.png b/docs/html/guide/samples/images/BluetoothChat2.png
new file mode 100644
index 0000000..6218eff
--- /dev/null
+++ b/docs/html/guide/samples/images/BluetoothChat2.png
Binary files differ