OSDN Git Service
Jamie Gennis [Wed, 23 Feb 2011 21:31:12 +0000 (13:31 -0800)]
am
76d0c763: (-s ours) am
fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '
76d0c763f008d19791e13ebabe9ec83958354bc5':
egl: fixes for object refcounts
Jamie Gennis [Wed, 23 Feb 2011 20:46:57 +0000 (12:46 -0800)]
am
fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
* commit '
fa238f033203f8e722b060af3f0095762b134f37':
egl: fixes for object refcounts
Jamie Gennis [Wed, 23 Feb 2011 20:30:55 +0000 (12:30 -0800)]
Merge "egl: fixes for object refcounts" into gingerbread
Scott Main [Wed, 23 Feb 2011 19:24:42 +0000 (11:24 -0800)]
am
2788e4f9: docs: fix some typos
* commit '
2788e4f96a3f210192145a340a1d072c70c7bc4f':
docs: fix some typos
Justin Ho [Wed, 23 Feb 2011 05:23:54 +0000 (21:23 -0800)]
am
da34ab21: am
9208875e: Updated iconography for network status and adding 4G assets
* commit '
da34ab214886531e5e9c0d975d0dc70cfe8a26a4':
Updated iconography for network status and adding 4G assets
Alon Albert [Wed, 23 Feb 2011 05:23:50 +0000 (21:23 -0800)]
am
1aba843d: am
ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '
1aba843dc327490a749059bcddff90e8048ed75c':
Support quoted parameters
Justin Ho [Wed, 23 Feb 2011 05:19:05 +0000 (21:19 -0800)]
am
9208875e: Updated iconography for network status and adding 4G assets
* commit '
9208875e92ec190d49864b92823dd7011b9b443a':
Updated iconography for network status and adding 4G assets
Alon Albert [Wed, 23 Feb 2011 05:18:52 +0000 (21:18 -0800)]
am
ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '
ccc802e12be64248c2c6822eb36a957435a06ef2':
Support quoted parameters
Robert Ly [Wed, 23 Feb 2011 05:15:28 +0000 (21:15 -0800)]
am
c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb
* commit '
c6c6fe939c83e644b7626f6d3f3be25883af1583':
doc change: fix missing code ending tag
Scott Main [Wed, 23 Feb 2011 05:15:23 +0000 (21:15 -0800)]
am
47928f89: Merge "docs: fix broken links" into honeycomb
* commit '
47928f898d81625cb1e66eea9eb6120f719e89ee':
docs: fix broken links
James Dong [Wed, 23 Feb 2011 05:15:19 +0000 (21:15 -0800)]
am
6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit '
6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
Scott Main [Wed, 23 Feb 2011 05:15:15 +0000 (21:15 -0800)]
am
0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb
* commit '
0ea4f0d79126e953a87604162c1b9a9e91ffbb1f':
docs: update highlights doc to remove preview
Scott Main [Wed, 23 Feb 2011 05:15:09 +0000 (21:15 -0800)]
am
9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
* commit '
9d5f35d9e0e406bd9e109879db890e361e137929':
docs: add breadcrumb trails to some docs, mostly manifest docs
Roman Nurik [Wed, 23 Feb 2011 05:15:03 +0000 (21:15 -0800)]
am
cba8efdf: Add more tags to the RenderScript sample listing.
* commit '
cba8efdff8a77b159f259d973b05d508a61206e1':
Add more tags to the RenderScript sample listing.
Dirk Dougherty [Wed, 23 Feb 2011 05:14:58 +0000 (21:14 -0800)]
am
7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
* commit '
7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
Roman Nurik [Wed, 23 Feb 2011 05:14:52 +0000 (21:14 -0800)]
am
4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb
* commit '
4f4cab75cc0dff361d181299f07a233e8bb1e1c0':
Document support for WebM/VP8 decoding.
Nick Pelly [Wed, 23 Feb 2011 05:14:46 +0000 (21:14 -0800)]
am
beb01c93: Merge "DO NOT MERGE." into honeycomb
* commit '
beb01c93f9bed3dd36fc8ee63a8a7ab8d6ec9c70':
DO NOT MERGE.
Scott Main [Wed, 23 Feb 2011 05:14:40 +0000 (21:14 -0800)]
am
4d62ef25: docs: revert ndk r6
* commit '
4d62ef259568a050e0103a9beff702f0edd03f61':
docs: revert ndk r6
Scott Main [Wed, 23 Feb 2011 05:14:34 +0000 (21:14 -0800)]
am
f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded
* commit '
f870c5af7ac45d1c865bb2de5696f45c24ac396d':
docs: add new-child tags to hide the "new" tag when a parent list item is expanded
Scott Main [Wed, 23 Feb 2011 05:14:15 +0000 (21:14 -0800)]
am
1f694390: docs: move 3.0 optimizing doc into the dev guide
* commit '
1f694390225b462f76d580fb150fb0a07585df48':
docs: move 3.0 optimizing doc into the dev guide
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug:
2964479
Robert Ly [Wed, 23 Feb 2011 00:57:06 +0000 (16:57 -0800)]
Merge "doc change: fix missing code ending tag" into honeycomb
Scott Main [Wed, 23 Feb 2011 00:49:32 +0000 (16:49 -0800)]
Merge "docs: fix broken links" into honeycomb
James Dong [Wed, 23 Feb 2011 00:41:29 +0000 (16:41 -0800)]
Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
Scott Main [Tue, 22 Feb 2011 23:36:31 +0000 (15:36 -0800)]
Merge "docs: update highlights doc to remove preview" into honeycomb
Scott Main [Tue, 22 Feb 2011 23:14:39 +0000 (15:14 -0800)]
Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
Maarten Hooft [Tue, 22 Feb 2011 22:48:40 +0000 (14:48 -0800)]
am
62f40c8b: (-s ours) am
99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
62f40c8bcf78ac872a01aee8840b808b5aeea1d8':
Import revised translations. DO NOT MERGE
Romain Guy [Tue, 22 Feb 2011 22:48:21 +0000 (14:48 -0800)]
am
ad492161: am
a2090bea: am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
ad492161e4384efe11daec60cd14902f6b2c662a':
Fix for #12945: ProgressBar.setMax() will always redraw.
Dirk Dougherty [Tue, 22 Feb 2011 20:47:25 +0000 (12:47 -0800)]
Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
Roman Nurik [Tue, 22 Feb 2011 20:43:15 +0000 (12:43 -0800)]
Merge "Document support for WebM/VP8 decoding." into honeycomb
Alon Albert [Tue, 22 Feb 2011 18:31:26 +0000 (10:31 -0800)]
Merge "Support quoted parameters" into gingerbread
Nick Pelly [Tue, 22 Feb 2011 17:10:32 +0000 (09:10 -0800)]
Merge "DO NOT MERGE." into honeycomb
Dirk Dougherty [Sun, 20 Feb 2011 02:07:20 +0000 (18:07 -0800)]
am
301431d9: Doc change: Final diff report for API 11.
* commit '
301431d96e85e37d1dc2dd0df88f894dda0f5404':
Doc change: Final diff report for API 11.
Scott Main [Sat, 19 Feb 2011 03:42:29 +0000 (19:42 -0800)]
resolved conflicts for merge of
b842629c to honeycomb-plus-aosp
Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6
Maarten Hooft [Fri, 18 Feb 2011 23:22:48 +0000 (15:22 -0800)]
am
99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
99cca89f41e500f8b39fd75eb17f337422c4ac90':
Import revised translations. DO NOT MERGE
Scott Main [Fri, 18 Feb 2011 23:11:14 +0000 (15:11 -0800)]
am
e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
* commit '
e4da39345209c47b2736f266adfc22a0fdb4c716':
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
Scott Main [Fri, 18 Feb 2011 23:08:26 +0000 (15:08 -0800)]
Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
Scott Main [Fri, 18 Feb 2011 18:40:59 +0000 (10:40 -0800)]
am
163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
* commit '
163413f4360af8a8b010fa69a131fb0177df96a7':
docs: update getting started doc for 3.0; move out of preview docs
Scott Main [Fri, 18 Feb 2011 18:26:41 +0000 (10:26 -0800)]
Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
Romain Guy [Fri, 18 Feb 2011 16:06:01 +0000 (08:06 -0800)]
am
a2090bea: am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
a2090bea4824cf153c4d9c735ee779613cf2e3d7':
Fix for #12945: ProgressBar.setMax() will always redraw.
Romain Guy [Fri, 18 Feb 2011 15:53:50 +0000 (07:53 -0800)]
am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945: ProgressBar.setMax() will always redraw.
Romain Guy [Fri, 18 Feb 2011 06:40:33 +0000 (22:40 -0800)]
Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
Robert Ly [Fri, 18 Feb 2011 04:21:35 +0000 (20:21 -0800)]
am
a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
* commit '
a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
Doc change: fixing renderscript samples
Scott Main [Fri, 18 Feb 2011 04:21:24 +0000 (20:21 -0800)]
am
0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
* commit '
0ddd2d1ea7cda544efc4d25601e1cdc0236e44d8':
DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
Robert Ly [Fri, 18 Feb 2011 02:53:36 +0000 (18:53 -0800)]
Merge "Doc change: fixing renderscript samples" into honeycomb
Maarten Hooft [Fri, 18 Feb 2011 01:17:40 +0000 (17:17 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Joe Malin [Thu, 17 Feb 2011 21:18:30 +0000 (13:18 -0800)]
am
e766fcd5: DOC CHANGE: Bug
3396898 add attribute uses-library
* commit '
e766fcd5e967c2400a1fe90a4a01e4f0a12dbd1d':
DOC CHANGE: Bug
3396898 add attribute uses-library
Andreas Huber [Wed, 16 Feb 2011 22:28:01 +0000 (14:28 -0800)]
am
79a97489: (-s ours) am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
79a97489494deb8bdae85696f612ec7acda54240':
DO NOT MERGE: Respond to RTSP server->client requests.
Andreas Huber [Wed, 16 Feb 2011 22:24:53 +0000 (14:24 -0800)]
am
dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '
dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
Scott Main [Wed, 16 Feb 2011 20:41:53 +0000 (12:41 -0800)]
am
0643d7c4: docs: add new tag for tasks doc
* commit '
0643d7c442f975efa35c9e3729d74555627a32b5':
docs: add new tag for tasks doc
Andy Stadler [Wed, 16 Feb 2011 20:20:36 +0000 (12:20 -0800)]
am
b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit '
b18350851633b1d3717f2484d27b76aa64788ce1':
@hide DPM global proxy settings
Andy Stadler [Wed, 16 Feb 2011 20:18:39 +0000 (12:18 -0800)]
Merge "@hide DPM global proxy settings" into honeycomb
Scott Main [Wed, 16 Feb 2011 20:08:36 +0000 (12:08 -0800)]
resolved conflicts for merge of
f722cecd to honeycomb-plus-aosp
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
Scott Main [Wed, 16 Feb 2011 19:58:40 +0000 (11:58 -0800)]
Merge "docs: update homepage for 3.0 announcement" into honeycomb
Robert Greenwalt [Wed, 16 Feb 2011 18:55:54 +0000 (10:55 -0800)]
am
de27b519: (-s ours) am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
de27b519588ed46c0ba601a489c01d26ec31757d':
DO NOT MERGE - backport of l92a02b31 from master
Robert Greenwalt [Wed, 16 Feb 2011 18:51:04 +0000 (10:51 -0800)]
am
3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '
3259d8853760a72b811757e1711119d041962a1c':
DO NOT MERGE - backport of l92a02b31 from master
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Eric Fischer [Wed, 16 Feb 2011 18:38:11 +0000 (10:38 -0800)]
am
874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:33:18 +0000 (10:33 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Alon Albert [Wed, 16 Feb 2011 18:26:53 +0000 (10:26 -0800)]
am
b79db4cd: (-s ours) am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
DO NOT MERGE - Clear backoffs on reconnect
Alon Albert [Wed, 16 Feb 2011 18:24:15 +0000 (10:24 -0800)]
am
be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit '
be5f82ab0ddacea3846cfa5aa846d1c97def0318':
DO NOT MERGE - Clear backoffs on reconnect
Scott Main [Wed, 16 Feb 2011 18:23:05 +0000 (10:23 -0800)]
am
796ce77a: docs: add breadcrumbs to articles and tutorials
* commit '
796ce77abf3d1d006576490c286e72ebf0736280':
docs: add breadcrumbs to articles and tutorials
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
daniel_tomas [Wed, 16 Feb 2011 17:43:08 +0000 (09:43 -0800)]
am
99e267eb: am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:41:00 +0000 (09:41 -0800)]
am
7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '
7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
New API added in NfcAdapter to enable/disable SE card emulation
Nick Pelly [Wed, 16 Feb 2011 17:25:09 +0000 (09:25 -0800)]
am
8c8e9d9a: am
1df862a4: Minor doc update.
* commit '
8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:23:08 +0000 (09:23 -0800)]
am
1df862a4: Minor doc update.
* commit '
1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
Scott Main [Wed, 16 Feb 2011 17:21:06 +0000 (09:21 -0800)]
am
f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
* commit '
f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
docs: edit doc titles to match side nav and add breadcrumb links
Andreas Huber [Wed, 16 Feb 2011 17:10:19 +0000 (09:10 -0800)]
am
16d94f58: (-s ours) am
8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '
16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Scott Main [Wed, 16 Feb 2011 17:06:43 +0000 (09:06 -0800)]
Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
Andreas Huber [Wed, 16 Feb 2011 17:02:08 +0000 (09:02 -0800)]
am
8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '
8db7a7bfadc7bdfa30f60bb06063f91b19234096':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Andreas Huber [Wed, 16 Feb 2011 16:50:37 +0000 (08:50 -0800)]
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
Robert Ly [Wed, 16 Feb 2011 06:58:51 +0000 (22:58 -0800)]
am
c3ebf27a: am
4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
* commit '
c3ebf27a511934d7529b2fbde223169e83c74561':
Adding package summary for nfc.tech package
Robert Ly [Wed, 16 Feb 2011 06:54:52 +0000 (22:54 -0800)]
am
4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
* commit '
4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
Adding package summary for nfc.tech package
Scott Main [Wed, 16 Feb 2011 04:08:30 +0000 (20:08 -0800)]
am
9cf2fa02: docs: add breadcrumbs to developing docs
* commit '
9cf2fa023bb55979853995a34a9fa9996a2212f0':
docs: add breadcrumbs to developing docs
Scott Main [Wed, 16 Feb 2011 04:08:26 +0000 (20:08 -0800)]
am
a766a8be: docs: add breadcrumbs to testing docs
* commit '
a766a8bee24b46fdeea2cc891e6ce202d906245f':
docs: add breadcrumbs to testing docs
Scott Main [Wed, 16 Feb 2011 04:08:21 +0000 (20:08 -0800)]
am
f2d52938: Merge "docs: revise loader doc title" into honeycomb
* commit '
f2d5293844a3c782ccd415d327007ec5e7681a26':
docs: revise loader doc title
Robert Ly [Wed, 16 Feb 2011 04:08:17 +0000 (20:08 -0800)]
am
e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb
* commit '
e250cbb8d5ea787c318bba384fd9cb46b446ea3d':
doc change: add rel note links to external tools site
Scott Main [Wed, 16 Feb 2011 04:08:12 +0000 (20:08 -0800)]
am
c918e4a8: docs: add parent links to graphics docs
* commit '
c918e4a86d42d89cb893b0150358cfd01ef7d532':
docs: add parent links to graphics docs
Scott Main [Wed, 16 Feb 2011 04:08:07 +0000 (20:08 -0800)]
am
13033ea5: docs: fix misc broken links
* commit '
13033ea52714d48d754c6bc8fccb18514c645a47':
docs: fix misc broken links
Scott Main [Wed, 16 Feb 2011 01:54:28 +0000 (17:54 -0800)]
Merge "docs: revise loader doc title" into honeycomb
Robert Ly [Wed, 16 Feb 2011 01:44:56 +0000 (17:44 -0800)]
Merge "Adding package summary for nfc.tech package" into gingerbread
Robert Ly [Wed, 16 Feb 2011 01:38:56 +0000 (17:38 -0800)]
Merge "doc change: add rel note links to external tools site" into honeycomb
Scott Main [Tue, 15 Feb 2011 23:49:43 +0000 (15:49 -0800)]
am
a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
* commit '
a460a9ac79bb79c2a410401a907a6bdf21320746':
docs: add 'new' tags and resolve some doc title regressions
Robert Ly [Tue, 15 Feb 2011 23:42:14 +0000 (15:42 -0800)]
am
c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
* commit '
c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
John Wang [Tue, 15 Feb 2011 20:40:49 +0000 (12:40 -0800)]
am
39014026: am
29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '
3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
Only decode EXT1 tag when it is available.
John Wang [Tue, 15 Feb 2011 20:38:38 +0000 (12:38 -0800)]
am
29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '
29853a356bb6ddb094df6d0f5dd04e2a63f25147':
Only decode EXT1 tag when it is available.
John Wang [Tue, 15 Feb 2011 20:34:37 +0000 (12:34 -0800)]
Merge "Only decode EXT1 tag when it is available." into gingerbread
Joe Malin [Tue, 15 Feb 2011 20:34:35 +0000 (12:34 -0800)]
am
6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
* commit '
6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
SDK docs: Hierarchy Viewer V2
Joe Malin [Tue, 15 Feb 2011 20:32:48 +0000 (12:32 -0800)]
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
Andreas Huber [Tue, 15 Feb 2011 19:51:33 +0000 (11:51 -0800)]
am
e0c9f275: (-s ours) am
d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
* commit '
e0c9f2757b0ebd291fec89ebb520878aacd3f7dc':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Andreas Huber [Tue, 15 Feb 2011 19:49:03 +0000 (11:49 -0800)]
am
d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
* commit '
d1ba051a465518fa4325c364ed77025fc1a2a794':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Scott Main [Tue, 15 Feb 2011 19:36:44 +0000 (11:36 -0800)]
am
97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb
* commit '
97ef3b416ada559c446d1d21d70d2604433b92f5':
docs: revise a couple sample app names to match side nav
Scott Main [Tue, 15 Feb 2011 19:33:43 +0000 (11:33 -0800)]
Merge "docs: revise a couple sample app names to match side nav" into honeycomb
Scott Main [Tue, 15 Feb 2011 19:07:06 +0000 (11:07 -0800)]
am
5a44efb4: docs: fix markup error
* commit '
5a44efb42738e4fd1b448004f74dc96372801936':
docs: fix markup error
Scott Main [Tue, 15 Feb 2011 00:07:47 +0000 (16:07 -0800)]
am
64b12eac: docs: add links to sample apps
* commit '
64b12eac53ba9acd456be2e23f34b5add18461ce':
docs: add links to sample apps
Scott Main [Mon, 14 Feb 2011 22:44:30 +0000 (14:44 -0800)]
am
865cd1ca: Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb
* commit '
865cd1ca5c31243764545dc888ee117a9215e837':
docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/
Scott Main [Mon, 14 Feb 2011 22:42:18 +0000 (14:42 -0800)]
Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb
Scott Main [Mon, 14 Feb 2011 22:41:14 +0000 (14:41 -0800)]
am
9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb
* commit '
9ab0f2b220a6b38cad020bb3f4940737a024a5f6':
docs: fix link to sample app
Scott Main [Mon, 14 Feb 2011 22:39:13 +0000 (14:39 -0800)]
Merge "docs: fix link to sample app" into honeycomb
OSDN Git Service
