Scott Main
aaa4662450
am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
...
* commit '7bf1c661f1a43236dd075616f4f04a776710dcb0':
docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
2011-05-05 17:56:50 -07:00
Scott Main
64cb372303
am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
...
* commit '034d89d9a4b56014ea198bcdeaa5ad922608ae40':
docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
2011-05-05 17:53:57 -07:00
Wink Saville
326f2a90e1
am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
...
* commit 'd237d05c6f36d4e514eac95a9bcc07106c3d97eb':
Add Delay for data connection retry.
2011-05-05 16:22:31 -07:00
Wink Saville
c63340f955
am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
...
* commit '8bc60413b9840c7fa724e52f1271936640e97736':
DataConnection: Fix handling of PDP setup failure.
2011-05-05 16:22:29 -07:00
Wink Saville
2e170d7619
Merge "Add Delay for data connection retry." into honeycomb-LTE
2011-05-05 16:20:11 -07:00
Wink Saville
2923ef40e7
Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
2011-05-05 16:20:02 -07:00
Bill Gruber
d53f647123
am 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
...
* commit '48f472f748e9404bdb93a93f20a530794f6cdc2f':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
2011-05-05 16:09:42 -07:00
Bill Gruber
7a9c37cfcb
am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
...
* commit '0369cf98743e72d052eb5542125f58d1ad2f7f61':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
2011-05-05 16:05:41 -07:00
Scott Main
444b3ce725
am 4c8fa6d1: am 1c71fffe: update platform version number for docs
...
* commit '4c8fa6d13500a7921601e098b47e2eb34aa18024':
update platform version number for docs
2011-05-05 15:24:12 -07:00
Scott Main
c46246ad8d
am 1c71fffe: update platform version number for docs
...
* commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
update platform version number for docs
2011-05-05 15:18:19 -07:00
Scott Main
b0a692bf9c
am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
...
* commit '475917c7e4002c42cdf668eabc1a04f604a82005':
docs: update homepage to announce 3.1
2011-05-05 08:54:07 -07:00
Scott Main
52018543db
am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
...
* commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94':
docs: update homepage to announce 3.1
2011-05-05 08:43:42 -07:00
Scott Main
d96c4779be
Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
2011-05-05 08:33:03 -07:00
Irfan Sheriff
fd69d2efe2
am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
...
* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
Handle GET_POWER failures
2011-05-04 21:19:19 -07:00
Irfan Sheriff
02683c0f5a
am 1a5b6098: Handle GET_POWER failures
...
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
2011-05-04 21:14:47 -07:00
Wink Saville
2165117a3d
am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit '676db0d301caf4fa64c2c1b8427fe2efd5cc7811':
Fix 4379712 NPE in GsmDataConnectionTracker
2011-05-04 17:04:19 -07:00
Robert Ly
58676c346a
am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
...
* commit '2246bc665d09e8f8e1dc35702fbe76e8bb270d56':
doc change: a misplaced link removed
2011-05-04 17:02:26 -07:00
Wink Saville
d686f61b81
Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
2011-05-04 17:01:32 -07:00
Robert Ly
a453ab1f14
am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
...
* commit '7157b7c31462e9340847d15d936bbb0b1117ecbb':
doc change: a misplaced link removed
2011-05-04 17:00:10 -07:00
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