Robert Ly
f59ce60a64
Merge "doc change: a misplaced link removed" into honeycomb-mr1
2011-05-04 16:55:59 -07:00
Robert Greenwalt
21d8a47de3
am aacd80fd: Fix build break.
...
* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
Fix build break.
2011-05-04 16:55:26 -07:00
Katie McCormick
2db814b2a1
am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
...
* commit '7d513652380ec4e1760e1f253d3630e4fdeb0ee5':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:49:17 -07:00
Katie McCormick
d2c0f942d5
am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
...
* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:47:10 -07:00
Scott Main
21cd518a36
am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
...
* commit 'f9e9452c2d6482a8181f6edb32f5c53bff10aa59':
cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
2011-05-04 15:20:03 -07:00
Scott Main
fd5101dc6a
am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
...
* commit 'ad3b87aa0d094c3e867ce44ec3f61e0b02090417':
cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
2011-05-04 15:09:53 -07:00
Scott Main
8800106114
am bb4ffd45: am 41703766: docs: typo in menu doc
...
* commit 'bb4ffd45c833a59882706bd53fde3b04bf4dc441':
docs: typo in menu doc
2011-05-04 14:44:23 -07:00
Scott Main
a80f0ea1ce
am 41703766: docs: typo in menu doc
...
* commit '41703766815918c96fa0f45c6f27a29a0865846a':
docs: typo in menu doc
2011-05-04 14:41:35 -07:00
Scott Main
033e80b542
am d566dc19: am 7017c942: docs: fix issue 4383086
...
* commit 'd566dc1906b83ff135743d757d87ab22aa6d391f':
docs: fix issue 4383086
2011-05-04 14:38:50 -07:00
Scott Main
0bcc66c626
am 7017c942: docs: fix issue 4383086
...
* commit '7017c94249f7d27643fefd242e9faf9e53ce986e':
docs: fix issue 4383086
2011-05-04 14:37:10 -07:00
Robert Ly
5ce11636ee
am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
...
* commit '7c8be3a75d541652a4eca9ad2433af90232b2af5':
adding the usb apis to the resources browser
2011-05-04 13:17:37 -07:00
Robert Ly
8d16a63941
am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
...
* commit '762481f0b58ac41b7583f74315fcb213ca0eb630':
adding the usb apis to the resources browser
2011-05-04 13:14:48 -07:00
Robert Ly
9b1d182b5d
Merge "adding the usb apis to the resources browser" into honeycomb-mr1
2011-05-04 13:10:54 -07:00
Robert Ly
607059c45a
am f0a1d683: am fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
...
* commit 'f0a1d683d9c45a2d5e8e22edaf991b1f9c5b4402':
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
2011-05-04 12:33:54 -07:00
Robert Ly
329a7c4c1b
am fd7974f5: Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
...
* commit 'fd7974f531b8784e7d229d31dda228cca0e7c2d8':
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
2011-05-04 12:27:39 -07:00
Robert Ly
7cbb613026
Merge "Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL" into honeycomb-mr1
2011-05-04 12:18:09 -07:00
Dan Morrill
55f6844c47
am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
...
* commit 'dacce73bcc53a21125f532d8000e7ec2e3c30a35':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
2011-05-04 10:29:34 -07:00
Robert Greenwalt
8fdedfd3d3
am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -07:00
Robert Greenwalt
9f7aa4c665
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
2011-05-04 09:59:30 -07:00
Mike Lockwood
2d479be9c6
am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
...
* commit '36132a488b2974db9a90da809c2f3eeab99a4427':
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
2011-05-04 08:57:59 -07:00
Mike Lockwood
609e1d9ac6
am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
...
* commit '8b1c74f96f93195326907db1bb07a3787a1c1b45':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
2011-05-04 08:57:56 -07:00
Mike Lockwood
8ee4a063c1
am a792c804: DO NOT MERGE MTP: Implement GetThumb command
...
* commit 'a792c804025e25eb8a110d1db63f26bbd09e0e6b':
DO NOT MERGE MTP: Implement GetThumb command
2011-05-04 08:57:47 -07:00
Mike Lockwood
0910f9ac14
am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
...
* commit 'af50821bace87aa83c7faba7bf139cfcaccf317a':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
2011-05-04 08:57:44 -07:00
Mike Lockwood
b1771c1290
am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files
...
* commit 'fdb50e6f8eaac31010b64fc79a60dacb5f776613':
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
2011-05-04 08:57:41 -07:00
Mike Lockwood
8e8b339f8b
am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
...
* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
2011-05-04 08:57:37 -07:00
Marco Nelissen
6b4abeb8b3
am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
...
* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
DO NOT MERGE Fix media scanner uri handling.
2011-05-04 08:57:33 -07:00
Mike Lockwood
a2b52f231f
am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
...
* commit 'c535f7f291f0bda688efcee62f21cf44d0ebe38e':
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
2011-05-04 08:57:29 -07:00
Mike Lockwood
259d650c71
am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
...
* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
DO NOT MERGE MTP and media provider support for multiple storage devices:
2011-05-04 08:57:23 -07:00
Mike Lockwood
dbd90e4157
am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot.
...
* commit '10fbba21e4827a1582d97aa99e4e8d772ce04920':
DO NOT MERGE MountService: Fix running media scanner at boot.
2011-05-04 08:57:19 -07:00
Mike Lockwood
c45fd5afb4
am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService
...
* commit '0aa5d7b7f225236ac8461d0b6835b9c6152a2699':
DO NOT MERGE Fix deadlock in MountService
2011-05-04 08:57:12 -07:00
Mike Lockwood
e5f7a9501f
am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
...
* commit 'e3b498be0ae05367e9b84f4fac2ac5cf57a6b091':
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
2011-05-04 08:57:07 -07:00
Mike Lockwood
6bf48f70f6
am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes
...
* commit '346a2d79ecd627e38bc7fc6874fb627995b8bc12':
DO NOT MERGE MountService: Add support for multiple volumes
2011-05-04 08:56:55 -07:00
Robert Ly
af35bf6440
am 88741823: am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
...
* commit '88741823a67fd8246b3926464bfaa2081b330f40':
Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:59:34 -07:00
Glenn Kasten
9cff62220f
am 3b698d18: am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
...
* commit '3b698d181b7f165c9b31f7d74be19a5ed7575347':
Account for race condition when attaching HDMI.
2011-05-03 16:59:31 -07:00
Robert Ly
68cc53fe03
am 7c2d14d5: Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
...
* commit '7c2d14d59637cfb06ebcfbb091541cebd131fc6a':
Doc change: fixing minor bug for xml resources bug 4376713
2011-05-03 16:57:52 -07:00
Glenn Kasten
3d8070ba89
am 9d8c6215: Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
...
* commit '9d8c6215d1aedb1e9f2e10c63e737427f13be884':
Account for race condition when attaching HDMI.
2011-05-03 16:57:45 -07:00
Robert Ly
f8647fc367
Merge "Doc change: fixing minor bug for xml resources bug 4376713" into honeycomb-mr1
2011-05-03 16:54:21 -07:00
Glenn Kasten
efd763ded8
Merge "Account for race condition when attaching HDMI." into honeycomb-mr1
2011-05-03 16:46:12 -07:00
Wink Saville
2ed006842b
am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
...
* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
IMS: Provide net_admin permission so that IPSec could be configured/used.
2011-05-03 16:33:08 -07:00
Wink Saville
b71fa02d0d
Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
2011-05-03 16:19:58 -07:00
Conley Owens
d330455c29
am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'eac835e52e8378b33a2b34b7edb803290154588d':
Removing dead store; it was likely a relict of debuging code.
2011-05-03 16:14:31 -07:00
Dan Morrill
b955b3327e
am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
...
* commit '4ec33c2aad59b2a745ee891c9b7246b9533d95e0':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
2011-05-03 14:59:52 -07:00
Dan Morrill
78419fd016
am 75c66458: am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
...
* commit '75c664582c5ce5d94826f37cb725b447a4d62c50':
Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:46:20 -07:00
Dan Morrill
95bf307d34
am 8325c3a8: Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
...
* commit '8325c3a89197e47cfc2eeb4117c927fb8cb91630':
Backporting I57c58c4083bd59f45095c184d6ca5a302f79ff6e to HC-MR1. New change since file was renamed, making cherry-pick impossible.
2011-05-03 12:26:16 -07:00
Conley Owens
1c4c6b4581
am 9c4ba258: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit '9c4ba2580e2ef582747cce2960804a2a5e4b776e':
Removing dead store; it was likely a relict of debuging code.
2011-05-03 12:07:19 -07:00
Wink Saville
d05bbd383d
am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE
...
* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
Make DataConnection asynchronous.
2011-05-02 23:44:16 -07:00
Wink Saville
1c503c26e0
Merge "Make DataConnection asynchronous." into honeycomb-LTE
2011-05-02 23:41:29 -07:00
Robert Greenwalt
8fa31b3a39
am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
...
* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
Add RouteInfo objects for tracking routes.
2011-05-02 13:29:22 -07:00
Robert Greenwalt
62bcdb5f45
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
2011-05-02 13:26:52 -07:00
Irfan Sheriff
2f31356a2a
am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
2011-05-02 12:26:52 -07:00