diff options
| author | Jason Chen <jasonchen@google.com> | 2010-11-04 09:29:55 -0700 |
|---|---|---|
| committer | Jason Chen <jasonchen@google.com> | 2010-11-04 09:29:55 -0700 |
| commit | 15d18efddd047406b62d5482356342fccd0f68dc (patch) | |
| tree | 4c110dd108fc151485cb5c8a38dadb3b73f270c8 /docs | |
| parent | ce4b523eb81a07b985ac08973e43d0c7629ff36d (diff) | |
| parent | f0452c250757f560205da19b02a9172e5d98a71c (diff) | |
| download | frameworks_base-15d18efddd047406b62d5482356342fccd0f68dc.zip frameworks_base-15d18efddd047406b62d5482356342fccd0f68dc.tar.gz frameworks_base-15d18efddd047406b62d5482356342fccd0f68dc.tar.bz2 | |
resolved conflicts for merge of f0452c25 to master
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 2 | ||||
| -rwxr-xr-x | docs/html/resources/samples/images/SipDemo.png | bin | 0 -> 72267 bytes | |||
| -rw-r--r-- | docs/html/resources/samples/index.jd | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index a2c94fe..1c1ece9 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -87,7 +87,7 @@ ?> <li> - <h2><span class="en">More</span> + <h2><span class="en">More</span> </h2> <ul> <li><a href="<?cs var:toroot ?>resources/faq/commontasks.html"> diff --git a/docs/html/resources/samples/images/SipDemo.png b/docs/html/resources/samples/images/SipDemo.png Binary files differnew file mode 100755 index 0000000..999bea9 --- /dev/null +++ b/docs/html/resources/samples/images/SipDemo.png diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd index 9fc8e0b..cbe6ca3 100644 --- a/docs/html/resources/samples/index.jd +++ b/docs/html/resources/samples/index.jd @@ -73,6 +73,10 @@ adapter).</dd> <dd>A sample application that demonstrates Android's search framework, including how to provide search suggestions for Quick Search Box.</dd> + <dt><a href="SipDemo/index.html">SIP Demo</a></dt> + <dd>An application that demonstrates how to make an internet-based call using the SIP + API.</dd> + <dt><a href="Snake/index.html">Snake</a></dt> <dd>An implementation of the classic game "Snake."</dd> |
