Scott Main
1db14c022e
am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
...
* commit 'd5335253cb55a48c0921fb23bb8dee7217f475aa':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
2011-06-02 10:56:14 -07:00
Scott Main
1d9bfbdec1
am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
...
* commit 'b04ac7ac0b3fcc8a16f7f81476a99a4dc44f8ae0':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
2011-06-02 10:55:49 -07:00
Scott Main
dc26da8320
am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
...
* commit 'a86290891a661ecdc8115fd441b44dcebedb9e3d':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
2011-06-02 10:01:53 -07:00
Scott Main
46b600df71
am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
...
* commit 'b82367512177999e240bb35ededcae20dd1e14ee':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
2011-06-02 10:01:51 -07:00
Scott Main
04e966268e
am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
...
* commit '0d5ed597b7b2a91d6a97d188df37caef039242af':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
2011-06-02 10:01:42 -07:00
Scott Main
7d0972efde
Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2
2011-06-02 09:52:09 -07:00
Scott Main
f95a59b340
Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
2011-06-02 09:49:43 -07:00
Scott Main
cac9b2cee3
Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
2011-06-02 09:47:31 -07:00
Andreas Huber
d2f99b158d
am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
...
* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
2011-06-02 07:37:52 -07:00
Dianne Hackborn
dde2aa2bde
am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit 'a5f8851019605be26dd9a628280092e27f8a5f31':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:34:31 -07:00
Dianne Hackborn
0c5ffe9987
am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
...
* commit '2969b51132b80c873663aa2472b21d3e95845927':
Add new supports-screen API to set maximum allowed size.
2011-06-01 22:31:26 -07:00
Dianne Hackborn
da86002d17
Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
2011-06-01 22:28:56 -07:00
Scott Main
57416d878e
am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
...
* commit 'ce214df999cffd7f135ed33008b00f9c5c81ef7b':
doc typo
2011-06-01 19:09:02 -07:00
Dianne Hackborn
476e004a6d
am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
...
* commit '8b9a2b6cbd9cf37e9f5aa1bfc7106c67a5e89202':
Work around OpenFeint bug.
2011-06-01 19:08:53 -07:00
Scott Main
5acfb5fa8c
am f58e6c98: Merge "doc typo" into honeycomb-mr2
...
* commit 'f58e6c982267e6e027b8a286ebe2a2e349348ee7':
doc typo
2011-06-01 18:29:54 -07:00
Dianne Hackborn
f81450c455
am e6676351: Work around OpenFeint bug.
...
* commit 'e66763516a9c27c192adaba417616371a1c3c9bf':
Work around OpenFeint bug.
2011-06-01 18:29:50 -07:00
Scott Main
a76b2cdc17
Merge "doc typo" into honeycomb-mr2
2011-06-01 18:19:12 -07:00
Adam Powell
eca8e2deb5
am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit '036c40f443a6d83881bc336a94b5da41bbc0bbcc':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:53:15 -07:00
Dianne Hackborn
663fd59ac8
am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '7cae137ed155f2d311f020bbb3e75730344fd5fc':
Compatibility mode never needed for normal size screens.
2011-06-01 12:51:08 -07:00
Adam Powell
d6a6bb6f53
am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
...
* commit 'fa8ee17702a79a2597670374679a0b1952f4630f':
Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:49:47 -07:00
Adam Powell
c3bab1a4c9
Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
2011-06-01 12:48:03 -07:00
Dianne Hackborn
2083dd1a58
am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
...
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
Compatibility mode never needed for normal size screens.
2011-06-01 12:47:29 -07:00
Dianne Hackborn
9e19c9e4ef
Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
2011-06-01 12:43:56 -07:00
Dianne Hackborn
af2c3397ae
am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '13e2bef4f67c5bc5ce93aade1431ae3332d361f0':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:43:35 -07:00
Dianne Hackborn
e593915ba6
am 80cf4e79: Merge "Fix issue #4500511 : Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
...
* commit '80cf4e79d2acd1f94b6a9866255459c6ab2760be':
Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore
2011-06-01 12:39:36 -07:00
Dianne Hackborn
5717c26845
Merge "Fix issue #4500511 : Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2
2011-06-01 12:34:48 -07:00
Adam Powell
9018cf8e63
am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
...
* commit 'ca234a0765e3b43ab202f29caceba68b7c5363df':
Fix bug 4501658 - adjust toast frame padding
2011-06-01 10:33:46 -07:00
Adam Powell
60888e4a1a
am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
...
* commit '8656ba1298da98dde9ff6517aa06b86317a65bf7':
Fix bug 4501658 - adjust toast frame padding
2011-06-01 10:29:58 -07:00
Adam Powell
d27a23d661
Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
2011-06-01 10:27:54 -07:00
Scott Main
1e1f5288f1
am 2b876a31: am f5992953: docs: fix typos
...
* commit '2b876a31e2a8a424b6e0c51e7a403cf64fe22f0f':
docs: fix typos
2011-06-01 09:54:00 -07:00
Martijn Coenen
3e1db14ded
am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.
...
* commit '0aa1017f9183bca752c95af72f73120e102ab2d3':
Prevent allocation overflows by corrupt NDEF records.
2011-06-01 09:51:15 -07:00
Scott Main
794992b956
am f5992953: docs: fix typos
...
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
docs: fix typos
2011-06-01 09:50:21 -07:00
Robert Greenwalt
725c6e2c78
am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
...
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
Remove redundent getCurrentCdmaDataConnectionState
2011-06-01 09:12:07 -07:00
Robert Greenwalt
d05f356f75
Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
2011-06-01 09:01:22 -07:00
Dianne Hackborn
ffd64a700a
am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2
...
* commit 'b8d109318f6fc88d1a59ca0e6e362963cd06960c':
Forgot this file.
2011-05-31 18:33:00 -07:00
Dianne Hackborn
1c131d4d87
am fd206560: Merge "Forgot this file." into honeycomb-mr2
...
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
Forgot this file.
2011-05-31 18:30:01 -07:00
Dianne Hackborn
5207046002
Merge "Forgot this file." into honeycomb-mr2
2011-05-31 18:28:50 -07:00
Dianne Hackborn
f02132fc13
am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
...
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
Fix issue #4502672 : Wrong xml resources used for homescreen widgets.
2011-05-31 18:11:29 -07:00
Dianne Hackborn
7c51115333
am 75d6b3c2: Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
...
* commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d':
Fix issue #4502672 : Wrong xml resources used for homescreen widgets.
2011-05-31 18:08:27 -07:00
Dianne Hackborn
13520e8a76
Merge "Fix issue #4502672 : Wrong xml resources used for homescreen widgets." into honeycomb-mr2
2011-05-31 18:05:26 -07:00
Joe Malin
f3b29e46b6
am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
...
* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
2011-05-31 16:43:55 -07:00
Joe Malin
d44e27c691
am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
...
* commit 'd40a5d5cb754b132d6c10ae78a6214f38ed23f3d':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
2011-05-31 16:40:59 -07:00
Jeff Brown
68eadf66b2
am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
...
* commit '425f2a6d71b3af058630367d75b0b924bf1aee49':
Use ViewConfiguration to seed input system configuration.
2011-05-31 15:51:21 -07:00
Jeff Brown
93600d98e1
am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '1311455f3ee8cbd2b2b83ec2d98e95e1da108743':
Button state should reflect actual buttons. (DO NOT MERGE)
2011-05-31 15:50:59 -07:00
Jeff Brown
4c61cbe97d
am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
...
* commit 'c272d4279493000928b8b7c6dbcf2d2b7d8d08b2':
Use ViewConfiguration to seed input system configuration.
2011-05-31 15:44:04 -07:00
Jeff Brown
3576fc419f
am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
...
* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
Button state should reflect actual buttons. (DO NOT MERGE)
2011-05-31 15:44:01 -07:00
Jeff Brown
5eba89ca43
Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
2011-05-31 15:42:18 -07:00
Jeff Brown
e63c757704
Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
2011-05-31 15:42:08 -07:00
Amith Yamasani
774eb124e7
am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit 'eb01203447afd2606b77739a0bd0b2ea216756e4':
Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:06:38 -07:00
Amith Yamasani
459541bd9c
am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
...
* commit '0119a67e72790fb14b05130e18fa0785b4fa8531':
Use Holo background and proper padding for App Permissions UI.
2011-05-31 14:02:11 -07:00