OSDN Git Service
Roman Nurik [Mon, 16 May 2011 23:06:27 +0000 (16:06 -0700)]
am
136fa20d: am
8f3dbe1c: am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
136fa20d08d3a25c49077fde076febf105452edc':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 23:03:31 +0000 (16:03 -0700)]
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.
Roman Nurik [Mon, 16 May 2011 23:01:27 +0000 (16:01 -0700)]
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.
Roman Nurik [Mon, 16 May 2011 22:58:08 +0000 (15:58 -0700)]
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
Wink Saville [Mon, 16 May 2011 22:51:02 +0000 (15:51 -0700)]
am
99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
* commit '
99f04c4943368ea7ea7f9d28fa941a1b387e7477':
Fix data attempt while PS is not in-service
Wink Saville [Mon, 16 May 2011 22:47:42 +0000 (15:47 -0700)]
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
Irfan Sheriff [Mon, 16 May 2011 21:09:26 +0000 (14:09 -0700)]
am
19055424: am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
190554246b6fda3453f4a7994fb461f841e82a4a':
Fix ISO country code of Slovenia.
Scott Main [Mon, 16 May 2011 21:06:25 +0000 (14:06 -0700)]
am
0593d383: am
8a29ffa3: am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
0593d383f3c50853123fa99fea172b37463990e0':
docs: add redirects to key legacy docs bug:
4439292
Irfan Sheriff [Mon, 16 May 2011 21:06:11 +0000 (14:06 -0700)]
am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
Scott Main [Mon, 16 May 2011 21:03:43 +0000 (14:03 -0700)]
am
8a29ffa3: am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
docs: add redirects to key legacy docs bug:
4439292
Irfan Sheriff [Mon, 16 May 2011 21:02:39 +0000 (14:02 -0700)]
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
Scott Main [Mon, 16 May 2011 21:01:30 +0000 (14:01 -0700)]
am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug:
4439292
Dianne Hackborn [Mon, 16 May 2011 20:16:45 +0000 (13:16 -0700)]
am
1d340a3c: am
0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '
1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Dianne Hackborn [Mon, 16 May 2011 20:13:00 +0000 (13:13 -0700)]
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.
Dianne Hackborn [Mon, 16 May 2011 20:10:23 +0000 (13:10 -0700)]
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
Dianne Hackborn [Mon, 16 May 2011 20:04:49 +0000 (13:04 -0700)]
am
fddd927f: am
9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
* commit '
fddd927fb78bb206287203f4f447a416b525115a':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Dianne Hackborn [Mon, 16 May 2011 20:02:57 +0000 (13:02 -0700)]
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.
Dianne Hackborn [Mon, 16 May 2011 20:01:38 +0000 (13:01 -0700)]
am
d90a2c4d: am
1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit '
d90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
Dianne Hackborn [Mon, 16 May 2011 20:01:07 +0000 (13:01 -0700)]
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
Dianne Hackborn [Mon, 16 May 2011 19:57:00 +0000 (12:57 -0700)]
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.
Dianne Hackborn [Mon, 16 May 2011 19:54:22 +0000 (12:54 -0700)]
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
Mike Lockwood [Mon, 16 May 2011 19:41:25 +0000 (12:41 -0700)]
am
e23639e0: am
15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
* commit '
e23639e0386735df50ad208078f638c38f662d42':
MTP: Have GetStorageInfo command return correct storage type for removable storage
Wink Saville [Mon, 16 May 2011 19:41:16 +0000 (12:41 -0700)]
am
fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE
* commit '
fe5b5d3700a5c67b5e8fcee324efe0fa24c4622c':
Implement incremental data stall recovery in GSM DCT
Mike Lockwood [Mon, 16 May 2011 19:38:36 +0000 (12:38 -0700)]
am
b822d246: am
0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
* commit '
b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
StorageManager: Clean up and generalize storage configuration resources
Mike Lockwood [Mon, 16 May 2011 19:38:18 +0000 (12:38 -0700)]
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
Wink Saville [Mon, 16 May 2011 19:37:55 +0000 (12:37 -0700)]
Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE
Mike Lockwood [Mon, 16 May 2011 19:36:29 +0000 (12:36 -0700)]
am
0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
* commit '
0a93d875527c52183080b63a0b19d567856952af':
StorageManager: Clean up and generalize storage configuration resources
Mike Lockwood [Mon, 16 May 2011 19:34:35 +0000 (12:34 -0700)]
Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
Robert Ly [Mon, 16 May 2011 19:34:26 +0000 (12:34 -0700)]
am
1f2a335f: am
79d3f630: am
904f4810: doc change: added link to diydrones and a few small changes
* commit '
1f2a335f98503bab178d1d868a9cba0451481b7d':
doc change: added link to diydrones and a few small changes
Mike Lockwood [Mon, 16 May 2011 19:34:02 +0000 (12:34 -0700)]
Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
Robert Ly [Mon, 16 May 2011 19:31:48 +0000 (12:31 -0700)]
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
Robert Ly [Mon, 16 May 2011 19:29:17 +0000 (12:29 -0700)]
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
Dianne Hackborn [Mon, 16 May 2011 18:09:31 +0000 (11:09 -0700)]
am
2a20583a: am
700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '
2a20583a5f436d66ab73cd6c0fdc73e59a3cecad':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Dirk Dougherty [Mon, 16 May 2011 18:07:02 +0000 (11:07 -0700)]
am
4bfc1cc0: am
8b8bfc5d: am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
4bfc1cc0a9bea7d7529b6c92daeb65660961b7d4':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:06:59 +0000 (11:06 -0700)]
am
81dd428d: am
582c1361: am
5eba0e98: docs: update featured videos and increase the max results for each playlist
* commit '
81dd428d70ae14dcceae3bab5271d726abf2f324':
docs: update featured videos and increase the max results for each playlist
Dianne Hackborn [Mon, 16 May 2011 18:06:28 +0000 (11:06 -0700)]
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.
Dirk Dougherty [Mon, 16 May 2011 18:03:56 +0000 (11:03 -0700)]
am
8b8bfc5d: am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:03:53 +0000 (11:03 -0700)]
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
Dianne Hackborn [Mon, 16 May 2011 18:02:29 +0000 (11:02 -0700)]
Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
Dirk Dougherty [Mon, 16 May 2011 18:01:44 +0000 (11:01 -0700)]
am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
babf844f4606f07de0e3349b5847faa2f8f208cc':
Doc change: typo fix
Scott Main [Mon, 16 May 2011 18:01:42 +0000 (11:01 -0700)]
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
Dirk Dougherty [Mon, 16 May 2011 17:59:00 +0000 (10:59 -0700)]
Merge "Doc change: typo fix" into honeycomb-mr1
Scott Main [Mon, 16 May 2011 17:37:33 +0000 (10:37 -0700)]
am
fa5a08be: am
1ff0131e: am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
fa5a08beed19f05b1946db55bd3ff9c13600f9f4':
docs: add oem driver for alcatel
Scott Main [Mon, 16 May 2011 17:24:28 +0000 (10:24 -0700)]
am
1ff0131e: am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
1ff0131e77e625af3100720a3552dc1f4064421d':
docs: add oem driver for alcatel
Scott Main [Mon, 16 May 2011 17:20:59 +0000 (10:20 -0700)]
am
fc0ea7ea: docs: add oem driver for alcatel
* commit '
fc0ea7ea5de429d9eea7f13bca42b98081d38dc5':
docs: add oem driver for alcatel
Wink Saville [Sun, 15 May 2011 21:43:52 +0000 (14:43 -0700)]
am
a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
* commit '
a1c29d30f342c2d3dbf7022f1b130934c2519b81':
Support for Vendor RIL dump of baseband logs
Wink Saville [Sun, 15 May 2011 21:43:49 +0000 (14:43 -0700)]
am
92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
* commit '
92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
Telephony: Handle Icc Status Changed Event.
Wink Saville [Sun, 15 May 2011 21:39:16 +0000 (14:39 -0700)]
Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
Wink Saville [Sun, 15 May 2011 21:38:59 +0000 (14:38 -0700)]
Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
Robert Greenwalt [Sun, 15 May 2011 15:03:46 +0000 (08:03 -0700)]
am
9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
* commit '
9713e3c60def9d755ae828d389fced4793a3c86a':
Fix bevhavior of fetchDunApn.
Robert Greenwalt [Sun, 15 May 2011 14:53:50 +0000 (07:53 -0700)]
Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
Wink Saville [Sat, 14 May 2011 14:43:00 +0000 (07:43 -0700)]
am
6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit '
6e41b32dd08a866cb7158b387646e96c9105831b':
TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
Wink Saville [Sat, 14 May 2011 14:35:21 +0000 (07:35 -0700)]
Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
Scott Main [Sat, 14 May 2011 03:34:11 +0000 (20:34 -0700)]
am
3cd61e2b: am
084d3490: am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:32:32 +0000 (20:32 -0700)]
am
084d3490: am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
084d3490a5283088426058d3c15532b176367926':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:29:45 +0000 (20:29 -0700)]
am
f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '
f73dcad35d031afc8e4db767d9b8bc40f389e4fc':
docs: update homepage I/O announcement
Scott Main [Sat, 14 May 2011 03:26:56 +0000 (20:26 -0700)]
Merge "docs: update homepage I/O announcement" into honeycomb-mr1
Dianne Hackborn [Sat, 14 May 2011 01:41:04 +0000 (18:41 -0700)]
am
ed9321ab: am
f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit '
ed9321ab5d282e40e7c5fa9caf0eb9d05646f2d0':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
Dianne Hackborn [Sat, 14 May 2011 01:39:01 +0000 (18:39 -0700)]
am
f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
* commit '
f9dd34f4d3203fd50363b3b0247c5d0db6fe2c8f':
DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.
Xavier Ducrohet [Fri, 13 May 2011 23:36:16 +0000 (16:36 -0700)]
am
6d040a7f: am
738c5e60: am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
6d040a7f20de29a9667dd81bd4de40a9e56fd341':
LayoutLib: implement data binding for most AdapterView
Xavier Ducrohet [Fri, 13 May 2011 23:32:47 +0000 (16:32 -0700)]
am
738c5e60: am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
738c5e6072459c772064c96233cf59639bbfe2fd':
LayoutLib: implement data binding for most AdapterView
Xavier Ducrohet [Fri, 13 May 2011 23:30:44 +0000 (16:30 -0700)]
am
2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '
2fae858db55fc6984ef923a6226b9408c37c72cb':
LayoutLib: implement data binding for most AdapterView
Dianne Hackborn [Fri, 13 May 2011 23:29:40 +0000 (16:29 -0700)]
am
7d87c37b: am
6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '
7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
Fix a bug where an action bar could be created when it should not be.
Dianne Hackborn [Fri, 13 May 2011 23:26:44 +0000 (16:26 -0700)]
am
6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
* commit '
6121f06ed5847d1edd22b23c3b28bf3b3e3af602':
Fix a bug where an action bar could be created when it should not be.
Dianne Hackborn [Fri, 13 May 2011 23:24:32 +0000 (16:24 -0700)]
Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2
Dianne Hackborn [Fri, 13 May 2011 22:45:23 +0000 (15:45 -0700)]
am
6824c135: am
f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit '
6824c135fe9639c74f38f125d678c20065c3347c':
DO NOT MERGE. Integrate fragment work from master
Dianne Hackborn [Fri, 13 May 2011 22:36:48 +0000 (15:36 -0700)]
am
f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit '
f3f2d731e19bb47a87dc071a5750fc0f18248da2':
DO NOT MERGE. Integrate fragment work from master
Dianne Hackborn [Fri, 13 May 2011 22:33:21 +0000 (15:33 -0700)]
Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
Jeff Brown [Fri, 13 May 2011 20:07:44 +0000 (13:07 -0700)]
am
2bdb756c: am
4fb76253: Fix bounds check. Bug:
4413945
* commit '
2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
Fix bounds check. Bug:
4413945
Jeff Brown [Fri, 13 May 2011 20:04:28 +0000 (13:04 -0700)]
am
4fb76253: Fix bounds check. Bug:
4413945
* commit '
4fb76253f255f0adb8a64835af37bb9176ee4016':
Fix bounds check. Bug:
4413945
Dianne Hackborn [Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)]
am
46a282f3: am
0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '
46a282f323bc05606e4fe1eba795bd9ac7c99819':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Dianne Hackborn [Fri, 13 May 2011 18:18:40 +0000 (11:18 -0700)]
am
0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '
0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Dianne Hackborn [Fri, 13 May 2011 18:16:42 +0000 (11:16 -0700)]
Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
Scott Main [Fri, 13 May 2011 18:03:27 +0000 (11:03 -0700)]
am
4c53fc7e: am
78b875e7: am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
4c53fc7ec921c0959f021a475fe0d91b7e6ddc2d':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 18:01:25 +0000 (11:01 -0700)]
am
2a959725: am
d32aeafc: am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
2a959725f569147878b3a78fae77e8679c8e16fa':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 18:00:27 +0000 (11:00 -0700)]
am
78b875e7: am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 17:58:29 +0000 (10:58 -0700)]
am
d32aeafc: am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
d32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 17:56:52 +0000 (10:56 -0700)]
am
edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '
edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
Scott Main [Fri, 13 May 2011 17:55:09 +0000 (10:55 -0700)]
am
432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
* commit '
432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
docs: enforce alphanumeric strings for video id to prevent XSS bug
4399806
Scott Main [Fri, 13 May 2011 17:54:00 +0000 (10:54 -0700)]
Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
Wink Saville [Fri, 13 May 2011 16:20:08 +0000 (09:20 -0700)]
am
55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
* commit '
55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
Wink Saville [Fri, 13 May 2011 16:09:43 +0000 (09:09 -0700)]
Merge "Add getLteOnCdamMode." into honeycomb-LTE
Dianne Hackborn [Fri, 13 May 2011 01:07:47 +0000 (18:07 -0700)]
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
Dianne Hackborn [Fri, 13 May 2011 00:39:30 +0000 (17:39 -0700)]
am
d46849a5: am
a8138732: MR2 is going to be API 13.
* commit '
d46849a535ab64fd47fc8e9c557ca5f4da9e977b':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:39:22 +0000 (17:39 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:37:06 +0000 (17:37 -0700)]
am
2cd423a0: Merge commit \'
01ea7f01\' into manualmerge1
* commit '
2cd423a049aeeb0c07f7a556f3a6f701b504606f':
DO NOT MERGE Add DhcpStateMachine
Dianne Hackborn [Fri, 13 May 2011 00:35:35 +0000 (17:35 -0700)]
am
a8138732: MR2 is going to be API 13.
* commit '
a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:35:20 +0000 (17:35 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:19:56 +0000 (17:19 -0700)]
Merge commit '
01ea7f01' into manualmerge1
Irfan Sheriff [Thu, 12 May 2011 23:02:43 +0000 (16:02 -0700)]
am
bb09485b: Merge commit \'
09564fbb\' into manualmerge
* commit '
bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
DO NOT MERGE Define Protocol class
Jean-Baptiste Queru [Thu, 12 May 2011 22:54:13 +0000 (15:54 -0700)]
am
2d7d3f78: (-s ours) am
f247e545: Merge "Adapt to latest skia"
* commit '
2d7d3f78c90734c8067ab76b8f5daca84a311c92':
Adapt to latest skia
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:16 +0000 (15:52 -0700)]
am
a84d29cb: am
6714e677: Merge "Ninepatch tweaks for better interop"
* commit '
a84d29cb0494310e9472884c7a459603eb305e38':
Ninepatch tweaks for better interop
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:12 +0000 (15:52 -0700)]
am
20fd3f0d: am
4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '
20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:03 +0000 (15:52 -0700)]
am
e8b669cb: (-s ours) am
71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '
e8b669cbd7b690349c908ce6c9ce3b342139de04':
Switch to SkSafeUnref for better portability
Irfan Sheriff [Thu, 12 May 2011 22:47:28 +0000 (15:47 -0700)]
Merge commit '
09564fbb' into manualmerge
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:18 +0000 (15:38 -0700)]
am
f247e545: Merge "Adapt to latest skia"
* commit '
f247e545b521584bb778e79710c1e60ab814839e':
Adapt to latest skia
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:15 +0000 (15:38 -0700)]
am
6714e677: Merge "Ninepatch tweaks for better interop"
* commit '
6714e6774063aae7a8a7a80c36c89ec60170cb27':
Ninepatch tweaks for better interop
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:11 +0000 (15:38 -0700)]
am
4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '
4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
Tweak audio APIs for better forward/backward/sideways compatibility.
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:07 +0000 (15:38 -0700)]
am
71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '
71d25778c61327bf82d0e81cd78175a9ee74420a':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 22:09:51 +0000 (15:09 -0700)]
Merge "Adapt to latest skia"
OSDN Git Service
