OSDN Git Service
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
Scott Main [Mon, 14 Feb 2011 22:32:40 +0000 (14:32 -0800)]
am
81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb
* commit '
81bb4952713da8c6d900508e72650d9388b2bfdc':
docs: add faketouch to uses-feature doc
Scott Main [Mon, 14 Feb 2011 22:29:09 +0000 (14:29 -0800)]
Merge "docs: add faketouch to uses-feature doc" into honeycomb
Scott Main [Mon, 14 Feb 2011 20:35:36 +0000 (12:35 -0800)]
am
ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb
* commit '
ecd8fa06e73b9d2ef6082af3f50e1daa194e9e08':
docs: add clarification to split touch events
Scott Main [Mon, 14 Feb 2011 20:33:10 +0000 (12:33 -0800)]
Merge "docs: add clarification to split touch events" into honeycomb
Katie McCormick [Mon, 14 Feb 2011 20:03:16 +0000 (12:03 -0800)]
am
28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
* commit '
28c3f5ca436f466638012934b8f3f1f923158118':
Doc change: New docs for Loaders.
Katie McCormick [Mon, 14 Feb 2011 20:01:04 +0000 (12:01 -0800)]
Merge "Doc change: New docs for Loaders." into honeycomb
Scott Main [Mon, 14 Feb 2011 19:46:38 +0000 (11:46 -0800)]
am
b254165a: Merge "docs: fix links" into honeycomb
* commit '
b254165af83849c21276bf832759a38d889cd90e':
docs: fix links
Scott Main [Mon, 14 Feb 2011 19:46:35 +0000 (11:46 -0800)]
am
2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
* commit '
2e80568263924b13c59a24d4d28fecb903bbc2a9':
add compatible-screens manifest element and update supports-screens element with resizeable attribute
Scott Main [Mon, 14 Feb 2011 19:44:49 +0000 (11:44 -0800)]
Merge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:44:10 +0000 (11:44 -0800)]
Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
Joe Malin [Mon, 14 Feb 2011 19:28:52 +0000 (11:28 -0800)]
am
55ee1d66: Merge "DOC CHANGE: Fix bug
3448489 - Monkeyrunner example" into honeycomb
* commit '
55ee1d66981f1edef966562f11c60886138544ea':
DOC CHANGE: Fix bug
3448489 - Monkeyrunner example
Joe Malin [Mon, 14 Feb 2011 19:26:00 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Fix bug
3448489 - Monkeyrunner example" into honeycomb
Scott Main [Mon, 14 Feb 2011 18:34:51 +0000 (10:34 -0800)]
am
ea72329b: docs: update 3.0 version notes
* commit '
ea72329bcc360437d67492bc4f2c82e65e8ba841':
docs: update 3.0 version notes
Joe Malin [Mon, 14 Feb 2011 18:05:46 +0000 (10:05 -0800)]
am
83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
* commit '
83c8b8a3284063c201beccc79f14db6bd715dd82':
Doc Change: Topics for copy/paste/drag/drop
Joe Malin [Mon, 14 Feb 2011 18:03:33 +0000 (10:03 -0800)]
Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
Xavier Ducrohet [Mon, 14 Feb 2011 17:57:17 +0000 (09:57 -0800)]
am
02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.
* commit '
02d2b5a4031c80bfe1012ce2f4f7b3695762abd9':
LayoutLib: When possible ensure parsers are popped from the stack.
Scott Main [Mon, 14 Feb 2011 17:25:30 +0000 (09:25 -0800)]
am
b269346c: am
d4952380: fix md5sum for windows installer
* commit '
b269346ca333a975d37ac50fec0c7b6a4c39a3de':
fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:14:12 +0000 (09:14 -0800)]
am
d4952380: fix md5sum for windows installer
* commit '
d49523809714b04636a9ac43de1c508ed1dbfc38':
fix md5sum for windows installer
Stephen Hines [Sat, 12 Feb 2011 00:47:04 +0000 (16:47 -0800)]
am
bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
* commit '
bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
Fix struct initializer for balls.
Roman Nurik [Sat, 12 Feb 2011 00:44:52 +0000 (16:44 -0800)]
am
b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
* commit '
b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
Stephen Hines [Sat, 12 Feb 2011 00:44:49 +0000 (16:44 -0800)]
Merge "Fix struct initializer for balls." into honeycomb
Roman Nurik [Sat, 12 Feb 2011 00:43:32 +0000 (16:43 -0800)]
Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
Robert Ly [Sat, 12 Feb 2011 00:30:15 +0000 (16:30 -0800)]
am
ccea5d27: Doc change: tools, adt, ndk release notes
* commit '
ccea5d27d37636db2669abec8a854fbd923440da':
Doc change: tools, adt, ndk release notes
Roman Nurik [Fri, 11 Feb 2011 23:42:57 +0000 (15:42 -0800)]
am
94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
* commit '
94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
Adam Cohen [Fri, 11 Feb 2011 23:23:27 +0000 (15:23 -0800)]
am
5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
* commit '
5a1b63572bf52142aa880cccc92636e65600bb60':
Adding StackWidget sample code
Adam Cohen [Fri, 11 Feb 2011 23:19:38 +0000 (15:19 -0800)]
Merge "Adding StackWidget sample code" into honeycomb
Winson Chung [Fri, 11 Feb 2011 23:15:33 +0000 (15:15 -0800)]
am
5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
* commit '
5f3cd3eabb7bcf8a293f84e84b0acbef682d3c88':
Associated changes for 'Adding sample for collection widgets backed by content providers.'
Winson Chung [Fri, 11 Feb 2011 23:07:06 +0000 (15:07 -0800)]
Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:49:09 +0000 (13:49 -0800)]
resolved conflicts for merge of
810c1c0c to honeycomb-plus-aosp
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
Robert Ly [Fri, 11 Feb 2011 21:18:41 +0000 (13:18 -0800)]
am
2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
* commit '
2be58282746de92773f6423d4ae55a2ef4e5f226':
Doc change: updating animation framework topic
Robert Ly [Fri, 11 Feb 2011 21:18:33 +0000 (13:18 -0800)]
am
997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
* commit '
997a671368c3b9f66f3a415876aaa94b391ab602':
Doc change: renderscript dev guide
Robert Ly [Fri, 11 Feb 2011 21:18:31 +0000 (13:18 -0800)]
am
322891c6: Doc change: nfc dev guide
* commit '
322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
Robert Ly [Fri, 11 Feb 2011 21:15:55 +0000 (13:15 -0800)]
Merge "Doc change: updating animation framework topic" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:15:35 +0000 (13:15 -0800)]
Merge "Doc change: renderscript dev guide" into honeycomb
James Dong [Fri, 11 Feb 2011 19:56:33 +0000 (11:56 -0800)]
am
f9e7442a: Update sample code in documentation
* commit '
f9e7442a0c0c7efc70d13fa9330baa797316154a':
Update sample code in documentation
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:16:45 +0000 (10:16 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:04:53 +0000 (10:04 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:54:59 +0000 (09:54 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:39:46 +0000 (09:39 -0800)]
Merge "stubs"
Steve Block [Fri, 11 Feb 2011 00:04:48 +0000 (16:04 -0800)]
stubs
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
Jason Sams [Thu, 10 Feb 2011 23:08:41 +0000 (15:08 -0800)]
am
cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
* commit '
cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
Basic 101 level compute example for RS.
Mathias Agopian [Thu, 10 Feb 2011 23:08:33 +0000 (15:08 -0800)]
am
b66b7a2c: Merge "fix [
3408713] Dialog window invisible sometimes" into honeycomb
* commit '
b66b7a2c183a1423ea629d4f73ed95f9b87d54b7':
fix [
3408713] Dialog window invisible sometimes
Dirk Dougherty [Thu, 10 Feb 2011 23:08:28 +0000 (15:08 -0800)]
am
12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
* commit '
12244c57960d85a066c94774e3e37685d0081213':
Doc change: changes for 3.0 SDK
Robert Ly [Thu, 10 Feb 2011 23:08:18 +0000 (15:08 -0800)]
am
bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
* commit '
bbdc4ce254e4918f771e448cd4fa9602679eaf2b':
clean up and add javadocs
Alex Sakhartchouk [Thu, 10 Feb 2011 23:08:14 +0000 (15:08 -0800)]
am
efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
* commit '
efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
Alex Sakhartchouk [Thu, 10 Feb 2011 23:07:59 +0000 (15:07 -0800)]
am
f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
* commit '
f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
Cleanup of the code in view to do creation/destruction in the right places.
Jean-Baptiste Queru [Thu, 10 Feb 2011 22:48:53 +0000 (14:48 -0800)]
Ignore
a8d3f02a from honeycomb - already there
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
OSDN Git Service
