Eric Fischer
37ce5ab46d
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -07:00
Mike Lockwood
8973de98b0
am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '50b27631598d56cf2def58270ddcf1619045dda4':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:12:32 -07:00
Adam Powell
edc63bcdb5
am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
2011-05-17 12:18:05 -07:00
Adam Powell
d1438416be
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
2011-05-17 12:16:29 -07:00
Scott Main
8e6b8a7366
am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:22:49 -07:00
Scott Main
dfd85f44da
am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:19:01 -07:00
Andreas Huber
d42e13e38a
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:31:58 -07:00
Andreas Huber
1e9440dc86
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
2011-05-17 10:29:36 -07:00
Adam Powell
e9a7006e63
am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:45:29 -07:00
Adam Powell
cf2cce0ad8
am 79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
...
* commit '79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
2011-05-17 09:45:26 -07:00
Adam Powell
0e85987167
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
2011-05-17 09:41:52 -07:00
Adam Powell
dee13897a2
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
2011-05-17 09:41:33 -07:00
Dianne Hackborn
1885b2bd28
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Wink Saville
7f83c278fb
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
2011-05-16 16:28:59 -07:00
Roman Nurik
e6f9a38375
am 8f3dbe1c: am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit '8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:03:31 -07:00
Roman Nurik
908a65b8f8
am ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
...
* commit 'ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
2011-05-16 16:01:27 -07:00
Roman Nurik
12192dfc47
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
2011-05-16 15:58:08 -07:00
Wink Saville
9608bf3919
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
2011-05-16 15:47:42 -07:00
Irfan Sheriff
aef5c3b0e9
am cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
...
* commit 'cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
2011-05-16 14:06:11 -07:00
Scott Main
d669c70374
am 8a29ffa3: am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:03:43 -07:00
Irfan Sheriff
3b440f7c8b
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
2011-05-16 14:02:39 -07:00
Scott Main
80769efc0a
am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:01:30 -07:00
Dianne Hackborn
6d4f911185
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00
Dianne Hackborn
b181f7ffa2
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
2011-05-16 13:10:23 -07:00
Dianne Hackborn
ea5d261564
am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
...
* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
2011-05-16 13:02:57 -07:00
Dianne Hackborn
9b076812bb
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
2011-05-16 13:01:07 -07:00
Dianne Hackborn
1c8ed2395c
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 12:57:00 -07:00
Dianne Hackborn
dac5784ab3
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
2011-05-16 12:54:22 -07:00
Mike Lockwood
84de4bdffb
am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
...
* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
MTP: Have GetStorageInfo command return correct storage type for removable storage
2011-05-16 12:38:18 -07:00
Wink Saville
2ba0507598
Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE
2011-05-16 12:37:55 -07:00
Mike Lockwood
39dda65713
am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
...
* commit '0a93d875527c52183080b63a0b19d567856952af':
StorageManager: Clean up and generalize storage configuration resources
2011-05-16 12:36:29 -07:00
Mike Lockwood
f3be466e9f
Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
2011-05-16 12:34:35 -07:00
Mike Lockwood
f35699af48
Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
2011-05-16 12:34:02 -07:00
Robert Ly
e8fecfb403
am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes
...
* commit '79d3f6305fc7dda68faf674e1c500f97cc4dd570':
doc change: added link to diydrones and a few small changes
2011-05-16 12:31:48 -07:00
Robert Ly
60aaec5f01
am 904f4810: doc change: added link to diydrones and a few small changes
...
* commit '904f48107e2843a1e255872afac8ddf8e9513ca4':
doc change: added link to diydrones and a few small changes
2011-05-16 12:29:17 -07:00
Dianne Hackborn
77c7b95e11
am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
...
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
2011-05-16 11:06:28 -07:00
Dirk Dougherty
20530813e6
am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
...
* commit '8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
Doc change: typo fix
2011-05-16 11:03:56 -07:00
Scott Main
59154d5e2c
am 582c1361: am 5eba0e98: docs: update featured videos and increase the max results for each playlist
...
* commit '582c1361e8a6443812a97f18094be1f8279645a0':
docs: update featured videos and increase the max results for each playlist
2011-05-16 11:03:53 -07:00
Dianne Hackborn
658d84fad7
Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
2011-05-16 11:02:29 -07:00
Dirk Dougherty
c1fca8eaf9
am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
...
* commit 'babf844f4606f07de0e3349b5847faa2f8f208cc':
Doc change: typo fix
2011-05-16 11:01:44 -07:00
Scott Main
19d44f26e7
am 5eba0e98: docs: update featured videos and increase the max results for each playlist
...
* commit '5eba0e98d1f7ed8f9d04a44adb8d8a37ef7f4659':
docs: update featured videos and increase the max results for each playlist
2011-05-16 11:01:42 -07:00
Dirk Dougherty
56526b508a
Merge "Doc change: typo fix" into honeycomb-mr1
2011-05-16 10:59:00 -07:00
Scott Main
82808fb000
am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel
...
* commit '1ff0131e77e625af3100720a3552dc1f4064421d':
docs: add oem driver for alcatel
2011-05-16 10:24:28 -07:00
Scott Main
45d5a051ad
am fc0ea7ea: docs: add oem driver for alcatel
...
* commit 'fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
docs: add oem driver for alcatel
2011-05-16 10:20:59 -07:00
Wink Saville
b20191867e
Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
2011-05-15 14:39:16 -07:00
Wink Saville
079aa0daf8
Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
2011-05-15 14:38:59 -07:00
Robert Greenwalt
22f76d0082
Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
2011-05-15 07:53:50 -07:00
Wink Saville
97f87eb6a8
Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
2011-05-14 07:35:21 -07:00
Scott Main
6c344c7803
am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit '084d3490a5283088426058d3c15532b176367926':
docs: update homepage I/O announcement
2011-05-13 20:32:32 -07:00
Scott Main
3fce43da30
am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
...
* commit 'f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
2011-05-13 20:29:45 -07:00