Commit Graph

32763 Commits

Author SHA1 Message Date
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
Robert Ly
cd60e524cf 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
2011-05-16 12:34:26 -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
30c47d2f95 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.
2011-05-16 11:09:31 -07:00
Dirk Dougherty
26d5761d23 am 4bfc1cc0: am 8b8bfc5d: am babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '4bfc1cc0a9bea7d7529b6c92daeb65660961b7d4':
  Doc change: typo fix
2011-05-16 11:07:02 -07:00
Scott Main
7468fa3c2e 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
2011-05-16 11:06:59 -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
039fc0a1ab am fa5a08be: am 1ff0131e: am fc0ea7ea: docs: add oem driver for alcatel
* commit 'fa5a08beed19f05b1946db55bd3ff9c13600f9f4':
  docs: add oem driver for alcatel
2011-05-16 10:37:33 -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
ff78de7c53 am a1c29d30: Merge "Support for Vendor RIL dump of baseband logs" into honeycomb-LTE
* commit 'a1c29d30f342c2d3dbf7022f1b130934c2519b81':
  Support for Vendor RIL dump of baseband logs
2011-05-15 14:43:52 -07:00
Wink Saville
51d3a78406 am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
* commit '92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
  Telephony: Handle Icc Status Changed Event.
2011-05-15 14:43:49 -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
37f8fca868 am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE
* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
  Fix bevhavior of fetchDunApn.
2011-05-15 08:03:46 -07:00
Robert Greenwalt
22f76d0082 Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE 2011-05-15 07:53:50 -07:00
Wink Saville
ac0abc1a61 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.
2011-05-14 07:43:00 -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
d1f60e04d7 am 3cd61e2b: am 084d3490: am f73dcad3: Merge "docs: update homepage I/O announcement" into honeycomb-mr1
* commit '3cd61e2bca2df05a9ad3679c7456b077f2d04f2b':
  docs: update homepage I/O announcement
2011-05-13 20:34:11 -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
Scott Main
ebbc478d9b Merge "docs: update homepage I/O announcement" into honeycomb-mr1 2011-05-13 20:26:56 -07:00
Dianne Hackborn
ade8cd9080 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.
2011-05-13 18:41:04 -07:00
Dianne Hackborn
923d3e4e36 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.
2011-05-13 18:39:01 -07:00
Xavier Ducrohet
b35013083f am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '6d040a7f20de29a9667dd81bd4de40a9e56fd341':
  LayoutLib: implement data binding for most AdapterView
2011-05-13 16:36:16 -07:00
Xavier Ducrohet
a20e479072 am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '738c5e6072459c772064c96233cf59639bbfe2fd':
  LayoutLib: implement data binding for most AdapterView
2011-05-13 16:32:47 -07:00
Xavier Ducrohet
0c36d14f6b am 2fae858d: LayoutLib: implement data binding for most AdapterView
* commit '2fae858db55fc6984ef923a6226b9408c37c72cb':
  LayoutLib: implement data binding for most AdapterView
2011-05-13 16:30:44 -07:00
Dianne Hackborn
7f1489bc4b 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.
2011-05-13 16:29:40 -07:00
Dianne Hackborn
e50994f021 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.
2011-05-13 16:26:44 -07:00
Dianne Hackborn
bd2fecd927 Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2 2011-05-13 16:24:32 -07:00
Dianne Hackborn
ac26a1fcc2 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
2011-05-13 15:45:23 -07:00
Dianne Hackborn
d26eaf683d am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2
* commit 'f3f2d731e19bb47a87dc071a5750fc0f18248da2':
  DO NOT MERGE.  Integrate fragment work from master
2011-05-13 15:36:48 -07:00
Dianne Hackborn
a15868e6cb Merge "DO NOT MERGE. Integrate fragment work from master" into honeycomb-mr2 2011-05-13 15:33:21 -07:00
Jeff Brown
292eebb698 am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945
* commit '2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
  Fix bounds check. Bug: 4413945
2011-05-13 13:07:44 -07:00
Jeff Brown
b7341bf80c am 4fb76253: Fix bounds check. Bug: 4413945
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
  Fix bounds check. Bug: 4413945
2011-05-13 13:04:28 -07:00
Dianne Hackborn
89178d4de2 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.
2011-05-13 11:21:26 -07:00
Dianne Hackborn
ed49d546d1 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.
2011-05-13 11:18:40 -07:00
Dianne Hackborn
29a781c814 Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 2011-05-13 11:16:42 -07:00
Scott Main
40b3400124 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
2011-05-13 11:03:27 -07:00