Andreas Huber
5840c57350
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)""
2011-02-15 15:56:20 -08:00
Scott Main
932a3b1fc7
am 40534523: am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
...
* commit '40534523304784fdc46f0de28fcaad9d3df2821b':
docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:52:25 -08:00
Scott Main
6dccef877e
am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
...
* commit 'a460a9ac79bb79c2a410401a907a6bdf21320746':
docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:49:43 -08:00
Robert Ly
75e87fe5d6
am 090662bd: am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
...
* commit '090662bdfc90c5f8925f554efd6ece12730a98dd':
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-15 15:47:56 -08:00
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
Fabrice Di Meglio
033932ad67
Merge "Small optimization when getting the spans"
2011-02-15 15:28:50 -08:00
Daisuke Miyakawa
49965ac411
Merge "Fix typo."
2011-02-15 15:21:09 -08:00
Adam Powell
f3a904902f
Merge "Fix bug 3362273 - Make overscroll glow appear within padding region"
2011-02-15 15:07:55 -08:00
Robert Greenwalt
ad8bf9c239
Merge "Remove some unused wifi dhcp code."
2011-02-15 14:26:37 -08:00
Andreas Huber
5998e8dbaa
Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary"
2011-02-15 14:12:56 -08:00
Andreas Huber
ec8dee180d
Merge "Work around several issues with non-compliant RTSP servers."
2011-02-15 13:31:14 -08:00
Amith Yamasani
e6f6b2b117
Merge "Don't change keyboard state in setIconifiedByDefault."
2011-02-15 13:06:20 -08:00
John Wang
efe8875f38
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-02-15 12:43:05 -08:00
John Wang
d946df281f
am d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit 'd0789ec99593bf556c88ff866a81d23449df1911':
Only decode EXT1 tag when it is available.
2011-02-15 12:43:00 -08:00
Mike Lockwood
343c52b0ed
Merge "MTP host: disable some test code"
2011-02-15 12:42:58 -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
Joe Malin
3b38a0bb4d
am 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
...
* commit '80dcc6aebfbca724f49c83d30cdad51ef980f0db':
SDK docs: Hierarchy Viewer V2
2011-02-15 12:37:36 -08:00
Mathias Agopian
64d0ef9cc4
Merge "fix [3452769] SensorEventListener can cause a java allocation at each received event [external]"
2011-02-15 12:34:48 -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
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