Romain Guy
79eed1e191
Merge "Deprecate ARGB_4444."
2011-02-14 15:35:54 -08:00
Andreas Huber
efade5c5c5
Merge "Enable cancelling the rtsp connection process early."
2011-02-14 15:35:45 -08:00
Robert Greenwalt
860143f0e4
Merge "Remove more use of netmask"
2011-02-14 14:48:05 -08:00
Scott Main
cb2b051c9d
am 753c22cf: 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 '753c22cfecb04cfdccea3b92197f73e7328d0b15':
docs: update sidenav; move loaders under activities, add "more" tags, remove duplicate for content providers, rename Copying/ to Copy/
2011-02-14 14:47:11 -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
e66dd9cb16
am 2d022d01: am 9ab0f2b2: Merge "docs: fix link to sample app" into honeycomb
...
* commit '2d022d01d0689b61de87bbf9ffd47703ceae1596':
docs: fix link to sample app
2011-02-14 14:43:53 -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
b35fcc0419
am 9a4548f5: am 81bb4952: Merge "docs: add faketouch to uses-feature doc" into honeycomb
...
* commit '9a4548f5ba53d9f91d5b1f9a349d795d16f6f82a':
docs: add faketouch to uses-feature doc
2011-02-14 14:36:24 -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
Dianne Hackborn
af01e9d6ad
Merge "Fix issue #3414684 : task_intra_wallpaper transitions have some inconsistency"
2011-02-14 14:28:23 -08:00
Dmitri Plotnikov
33f0bef461
Merge "Full text search: removing unused deprecated hidden API."
2011-02-14 14:21:09 -08:00
Erik
51477243a7
Merge "Add comment about not changing calendar authority"
2011-02-14 13:36:16 -08:00
Adam Cohen
bd9dcf8632
Merge "Making AdapaterViewAnimator setDisplayedChild remotable"
2011-02-14 12:57:16 -08:00
Scott Main
20c10be7d3
am 0e9e74e8: am ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb
...
* commit '0e9e74e86e6a126adafb79b0fa768008aba39e3d':
docs: add clarification to split touch events
2011-02-14 12:38:30 -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
103d8b630d
am 1d0fad21: am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
...
* commit '1d0fad219d78652f8d93344054466b664c2a6699':
Doc change: New docs for Loaders.
2011-02-14 12:06:02 -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
3aca711c05
am 06174dde: am b254165a: Merge "docs: fix links" into honeycomb
...
* commit '06174dde79748683401771951800d54415ad48c5':
docs: fix links
2011-02-14 11:49:25 -08:00
Scott Main
9cd171bf9c
am 1d7fb0a6: am 2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb
...
* commit '1d7fb0a6aa0283484676a26e123aee6871828025':
add compatible-screens manifest element and update supports-screens element with resizeable attribute
2011-02-14 11:49:17 -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
1ce5608d96
am 7aceb8d8: am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
...
* commit '7aceb8d814f0d803919c8f8a09e752eeaa979b92':
DOC CHANGE: Fix bug 3448489 - Monkeyrunner example
2011-02-14 11:31:31 -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
bd5c3878e3
am 002c028c: am ea72329b: docs: update 3.0 version notes
...
* commit '002c028c569361b64d8475c59aa8ced29045b5ae':
docs: update 3.0 version notes
2011-02-14 10:37:44 -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
Michael Kolb
9933ddedd2
Merge "Add title bar gravity"
2011-02-14 10:26:55 -08:00
Svetoslav Ganov
ebbaa33006
Merge "Accessibility events generated by WebView contain non well formed markup."
2011-02-14 10:17:51 -08:00
Joe Malin
bbbf73ffe2
am b2206668: am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
...
* commit 'b2206668d1559df2f0885723e89e7f59d372c7e0':
Doc Change: Topics for copy/paste/drag/drop
2011-02-14 10:08:26 -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
ea9abc3190
am 1858c95e: am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.
...
* commit '1858c95e99f81ac46eea93288cb8866260b3d5d8':
LayoutLib: When possible ensure parsers are popped from the stack.
2011-02-14 09:59:58 -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
a0e5172d0b
am a7276805: am b269346c: am d4952380: fix md5sum for windows installer
...
* commit 'a7276805bfad4b3170f7887f8358b5f8e5bef943':
fix md5sum for windows installer
2011-02-14 09:46:08 -08:00
Xia Wang
415485bafe
Merge "Add wait time for Wi-Fi tethering test, bug http://b/issue?id=3436586 "
2011-02-14 09:32:10 -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
Daniel Sandler
f388fd32a3
Merge "Put the pocket back in my pocket for later."
2011-02-14 08:21:03 -08:00
Adam Cohen
f053b37eed
Merge "Fixing a bug in RemoteViewsAdapter where cached items weren't being marked as requested"
2011-02-11 18:25:43 -08:00
Basavapatna Dattaguru
da2cb18e5f
Merge "VideoEditor: Fixes Issue ID:3448077"
2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
f4a95d6e8d
Merge "VideoEditor: Populate profile&level: Issue:3419090"
2011-02-11 17:48:45 -08:00
Vasu Nori
0163f9acbb
Merge "add more debug info to help (bug:3446432)"
2011-02-11 16:57:40 -08:00
Eric Laurent
99700fe277
Merge "Fix issue 3400751."
2011-02-11 16:54:48 -08:00