Robert Ly
1677650e20
am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
...
* commit 'c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-15 15:42:14 -08:00
John Wang
26d4c0bbfb
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.
2011-02-15 12:40:49 -08:00
John Wang
e85d8d6620
am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
Only decode EXT1 tag when it is available.
2011-02-15 12:38:38 -08:00
John Wang
6ac7359b83
Merge "Only decode EXT1 tag when it is available." into gingerbread
2011-02-15 12:34:37 -08:00
Joe Malin
51b31fd535
am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
...
* commit '6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
SDK docs: Hierarchy Viewer V2
2011-02-15 12:34:35 -08:00
Joe Malin
29443fa8df
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
2011-02-15 12:32:48 -08:00
Andreas Huber
69c18abf5e
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.
2011-02-15 11:51:33 -08:00
Andreas Huber
81147459b8
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.
2011-02-15 11:49:03 -08:00
Scott Main
2d2cd40e1f
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
2011-02-15 11:36:44 -08:00
Scott Main
56ce6fecc6
Merge "docs: revise a couple sample app names to match side nav" into honeycomb
2011-02-15 11:33:43 -08:00
Scott Main
3c3b9805bc
am 5a44efb4: docs: fix markup error
...
* commit '5a44efb42738e4fd1b448004f74dc96372801936':
docs: fix markup error
2011-02-15 11:07:06 -08:00
Scott Main
146c15cd67
am 64b12eac: docs: add links to sample apps
...
* commit '64b12eac53ba9acd456be2e23f34b5add18461ce':
docs: add links to sample apps
2011-02-14 16:07:47 -08:00
Scott Main
23276ad9a4
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/
2011-02-14 14:44:30 -08:00
Scott Main
6c9627f5e4
Merge "docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/" into honeycomb
2011-02-14 14:42:18 -08:00
Scott Main
06f96347fa
am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb
...
* commit '9ab0f2b220a6b38cad020bb3f4940737a024a5f6':
docs: fix link to sample app
2011-02-14 14:41:14 -08:00
Scott Main
13062442b8
Merge "docs: fix link to sample app" into honeycomb
2011-02-14 14:39:13 -08:00
Scott Main
6761629b0b
am 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb
...
* commit '81bb4952713da8c6d900508e72650d9388b2bfdc':
docs: add faketouch to uses-feature doc
2011-02-14 14:32:40 -08:00
Scott Main
b8995055ce
Merge "docs: add faketouch to uses-feature doc" into honeycomb
2011-02-14 14:29:09 -08:00
Scott Main
4442d33272
am ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb
...
* commit 'ecd8fa06e73b9d2ef6082af3f50e1daa194e9e08':
docs: add clarification to split touch events
2011-02-14 12:35:36 -08:00
Scott Main
4138553c0c
Merge "docs: add clarification to split touch events" into honeycomb
2011-02-14 12:33:10 -08:00
Katie McCormick
dffd964e8b
am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
...
* commit '28c3f5ca436f466638012934b8f3f1f923158118':
Doc change: New docs for Loaders.
2011-02-14 12:03:16 -08:00
Katie McCormick
900ba34bd0
Merge "Doc change: New docs for Loaders." into honeycomb
2011-02-14 12:01:04 -08:00
Scott Main
f8d93fa78d
am b254165a: Merge "docs: fix links" into honeycomb
...
* commit 'b254165af83849c21276bf832759a38d889cd90e':
docs: fix links
2011-02-14 11:46:38 -08:00
Scott Main
1cea71d64c
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
2011-02-14 11:46:35 -08:00
Scott Main
86c18e1c5f
Merge "docs: fix links" into honeycomb
2011-02-14 11:44:49 -08:00
Scott Main
b2490d6af6
Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
2011-02-14 11:44:10 -08:00
Joe Malin
53bdff8a2b
am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
...
* commit '55ee1d66981f1edef966562f11c60886138544ea':
DOC CHANGE: Fix bug 3448489 - Monkeyrunner example
2011-02-14 11:28:52 -08:00
Joe Malin
b9541ed2e5
Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
2011-02-14 11:26:00 -08:00
Scott Main
d1ef0c78c4
am ea72329b: docs: update 3.0 version notes
...
* commit 'ea72329bcc360437d67492bc4f2c82e65e8ba841':
docs: update 3.0 version notes
2011-02-14 10:34:51 -08:00
Joe Malin
5893c9c02b
am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
...
* commit '83c8b8a3284063c201beccc79f14db6bd715dd82':
Doc Change: Topics for copy/paste/drag/drop
2011-02-14 10:05:46 -08:00
Joe Malin
9e3183999c
Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
2011-02-14 10:03:33 -08:00
Xavier Ducrohet
2ee6eab42d
am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.
...
* commit '02d2b5a4031c80bfe1012ce2f4f7b3695762abd9':
LayoutLib: When possible ensure parsers are popped from the stack.
2011-02-14 09:57:17 -08:00
Scott Main
9acd998bcf
am b269346c: am d4952380: fix md5sum for windows installer
...
* commit 'b269346ca333a975d37ac50fec0c7b6a4c39a3de':
fix md5sum for windows installer
2011-02-14 09:25:30 -08:00
Scott Main
1f14e87b4c
am d4952380: fix md5sum for windows installer
...
* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
fix md5sum for windows installer
2011-02-14 09:14:12 -08:00
Stephen Hines
2d917c1675
am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
...
* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
Fix struct initializer for balls.
2011-02-11 16:47:04 -08:00
Roman Nurik
cbc11b7a74
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.
2011-02-11 16:44:52 -08:00
Stephen Hines
906bb20fa7
Merge "Fix struct initializer for balls." into honeycomb
2011-02-11 16:44:49 -08:00
Roman Nurik
afb5dda2f2
Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
2011-02-11 16:43:32 -08:00
Robert Ly
6163399831
am ccea5d27: Doc change: tools, adt, ndk release notes
...
* commit 'ccea5d27d37636db2669abec8a854fbd923440da':
Doc change: tools, adt, ndk release notes
2011-02-11 16:30:15 -08:00
Roman Nurik
595abee860
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.
2011-02-11 15:42:57 -08:00
Adam Cohen
4956b09d6b
am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
...
* commit '5a1b63572bf52142aa880cccc92636e65600bb60':
Adding StackWidget sample code
2011-02-11 15:23:27 -08:00
Adam Cohen
dd8df9a233
Merge "Adding StackWidget sample code" into honeycomb
2011-02-11 15:19:38 -08:00
Winson Chung
bff6b07797
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.'
2011-02-11 15:15:33 -08:00
Winson Chung
d25f3d54db
Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb
2011-02-11 15:07:06 -08:00
Robert Ly
120a181976
resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
...
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
2011-02-11 13:49:09 -08:00
Robert Ly
7e67e8bdfc
am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
...
* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
Doc change: updating animation framework topic
2011-02-11 13:18:41 -08:00
Robert Ly
be46db59f1
am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
...
* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
Doc change: renderscript dev guide
2011-02-11 13:18:33 -08:00
Robert Ly
6619488871
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Robert Ly
b7425b51b5
Merge "Doc change: updating animation framework topic" into honeycomb
2011-02-11 13:15:55 -08:00
Robert Ly
5e349a4031
Merge "Doc change: renderscript dev guide" into honeycomb
2011-02-11 13:15:35 -08:00