Andreas Huber
91e20a6e69
am ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
...
* commit 'ad1831a56fd60779464326468ee1d471a10f71a0':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
2011-02-15 11:53:47 -08:00
Shimeng (Simon) Wang
84e24b6bbc
Merge "Keep overview mode when screen is rotated."
2011-02-15 11:52:16 -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
c74a829e1c
am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb
...
* commit '2b0c6fdfff0faf17163d126ac21c1651e4053968':
docs: revise a couple sample app names to match side nav
2011-02-15 11:38:50 -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
Adam Powell
3b076b47c6
Merge "Fix some bugs with MenuPopupHelper and ListPopupWindow"
2011-02-15 11:16:01 -08:00
Scott Main
752338eec5
am 9b833cf0: am 5a44efb4: docs: fix markup error
...
* commit '9b833cf0cb499f2fe66319f9773f88fb94a85709':
docs: fix markup error
2011-02-15 11:09:19 -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
Gilles Debunne
08e62e9cc0
Merge "Text insertion cursor is now defined by a Drawable."
2011-02-15 10:41:30 -08:00
Shimeng (Simon) Wang
94d51e1904
Merge "Keep mobile site's text wrap scale unchanged."
2011-02-15 10:12:29 -08:00
Chet Haase
c8798522e7
Merge "Fix when >2 keyframes supplied"
2011-02-15 06:46:48 -08:00
satok
d5466ae5f2
Merge "Add the Id of InputMethodInfo at the tail of Application label at sorting InputMethods"
2011-02-15 00:58:29 -08:00
Basavapatna Dattaguru
6c1e9f6c11
Merge "VideoEditor:Inconsistance defines:Issue ID:3419090"
2011-02-14 20:14:38 -08:00
Basavapatna Dattaguru
aba87c065c
Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes"
2011-02-14 19:31:52 -08:00
Christopher Tate
2c130ab42c
Merge "Disable cross-app drag/drop"
2011-02-14 18:14:49 -08:00
Mathias Agopian
345a10eb41
Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external]"
2011-02-14 18:14:16 -08:00
Teng-Hui Zhu
1e3502a130
Merge "WebView's scrollBarStyle need to be set at init"
2011-02-14 17:23:58 -08:00
Romain Guy
d170e1bc95
Merge "Gracefully handle drawing caches allocation failure. Bug #3431451 "
2011-02-14 16:34:15 -08:00
Jim Miller
65346fa327
Merge "Fix 3409550: Fix crash caused when max pattern attempts met."
2011-02-14 16:27:18 -08:00
Jim Miller
148ccfb393
Merge "Fix 3423212: Constrain large app icons to 64x64 in recents."
2011-02-14 16:16:30 -08:00
Basavapatna Dattaguru
0fb541fe28
Merge "VideoEditor: Issue ID:3396697 Missing Files added"
2011-02-14 16:12:13 -08:00
Scott Main
f31b4cff9b
am d2bd6f4d: am 64b12eac: docs: add links to sample apps
...
* commit 'd2bd6f4d49489db429650a3308554c1d45cb31b6':
docs: add links to sample apps
2011-02-14 16:10:10 -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
Jaikumar Ganesh
ffeae5e1e6
Merge changes I7a5c806d,Iaa0a773e,I818b0c70,I4dfe14ce,I32a8d274
...
* changes:
Make profile handler classes package and final.
Fix ANR in Settings and Phone app.
Refactor Input profile operations from Bluetooth Service.
Remove Bluetooth Pan operations from Bluetooth Service.
Distinguish between NAP and PAN role disconnections
2011-02-14 15:41:59 -08:00
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