Joe Onorato
f471b1ea7b
Merge "Fix race conditions in WakeLocks."
2011-05-04 18:13:10 -07:00
Irfan Sheriff
4145b8846d
Merge "Add basic walled garden check"
2011-05-04 17:58:04 -07:00
Jeff Sharkey
b11b5a7438
Merge "Return NetworkStats bundle from NM service."
2011-05-04 17:49:01 -07:00
Chet Haase
6cebed79c3
Merge "Add ability for hierarchyviewer to output displaylist info"
2011-05-04 17:30:30 -07:00
Wink Saville
1001a6b452
am ece6eb56: am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit 'ece6eb5625ac8b597f60d67f30f431ea13f237a5':
Fix 4379712 NPE in GsmDataConnectionTracker
2011-05-04 17:06:46 -07:00
Robert Ly
97cb331437
am 796ba68b: am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
...
* commit '796ba68b73fa93ae290cf85b264183ffcfa45eba':
doc change: a misplaced link removed
2011-05-04 17:04:50 -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 Greenwalt
8f6e1e35ba
am 5673c13b: am aacd80fd: Fix build break.
...
* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
Fix build break.
2011-05-04 16:59:47 -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
842c02476d
am cfb91777: am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
...
* commit 'cfb917770a063174dc188c28200d31c206e0bbfc':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:51:53 -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
Joe Onorato
2705593910
Merge "If there is no hdmi available, still record that hdmi is not plugged in."
2011-05-04 15:29:15 -07:00
Scott Main
ac04ed0f00
am bcac77ec: am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
...
* commit 'bcac77ec5c86dda8bacf3ab7c2c5a5597bf6cbd2':
cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
2011-05-04 15:23:31 -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
Joe Onorato
f05c17a832
Merge "Rename ViewRoot to ViewAncestor."
2011-05-04 14:52:37 -07:00
Scott Main
d4b483d5bc
am e9091efe: am bb4ffd45: am 41703766: docs: typo in menu doc
...
* commit 'e9091efe44f75795fdbad46ef9393d886de806d9':
docs: typo in menu doc
2011-05-04 14:48:10 -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
0c78d66b86
am fe4ce465: am d566dc19: am 7017c942: docs: fix issue 4383086
...
* commit 'fe4ce4651a8412dfd9780f1078fc1533e4c4b41e':
docs: fix issue 4383086
2011-05-04 14:41:45 -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
James Dong
9fe3c944ff
Merge "Initial check-in for AACWriter"
2011-05-04 13:56:36 -07:00
Robert Ly
90f1174cce
am 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
...
* commit '232ea51c9c1af7a56e2315de863d65382c7c9a67':
adding the usb apis to the resources browser
2011-05-04 13:20:11 -07:00
Andreas Huber
9b68628992
Merge "Signal an error if aac decoding fails early."
2011-05-04 13:18:36 -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
Jason Sams
2c492bbe2d
Merge "Fix error checks on compute context creation. Remove GL init for compute scripts."
2011-05-04 12:59:50 -07:00
Robert Ly
de7123dd40
am 4c8112f2: 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 '4c8112f2f8f87a9d20195b133352604352049dbd':
Doc change: adding usb docs and removed ADK doc. ADK doc will be in another CL
2011-05-04 12:47:58 -07:00
Dan Morrill
d501c80db5
am 6d36190a: (-s ours) am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
...
* commit '6d36190a7379ec1783c6eb5a27c946118dd53648':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
2011-05-04 12:47:51 -07:00
Robert Greenwalt
3b79136526
am 9c7e6fc5: am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit '9c7e6fc50614cc1739d4bfbf6187893c27b01a67':
Add auto-restore timeout for secondary networks.
2011-05-04 12:47:30 -07:00
Mike Lockwood
3146d231cc
am 63de615d: (-s ours) am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
...
* commit '63de615ddb3cb81bbb5b548693faca971d182a6d':
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
2011-05-04 12:47:21 -07:00
Mike Lockwood
4fd1cf42b7
am 0faefb72: (-s ours) am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
...
* commit '0faefb72fb8917c9408f7b71c2bac5a9d5f264c2':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
2011-05-04 12:47:18 -07:00
Mike Lockwood
233c6b3270
am df889448: (-s ours) am a792c804: DO NOT MERGE MTP: Implement GetThumb command
...
* commit 'df8894486c246a8c4e47cc2b3547e9c173225f34':
DO NOT MERGE MTP: Implement GetThumb command
2011-05-04 12:47:14 -07:00
Mike Lockwood
2ac2cc6c56
am af964a63: (-s ours) am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
...
* commit 'af964a632dafed7d56d1faf0427b9b9056346e20':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
2011-05-04 12:47:10 -07:00
Mike Lockwood
80d39922c8
am eeaf48ca: (-s ours) am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files
...
* commit 'eeaf48ca8572b2fcb3fe05a22eb6759027924197':
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
2011-05-04 12:47:06 -07:00
Mike Lockwood
cfea9a409d
am f6df5b41: (-s ours) am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
...
* commit 'f6df5b41e145ee996ca4f94bec014ab3e41f0b21':
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
2011-05-04 12:47:02 -07:00
Marco Nelissen
614a822d87
am 863ee409: (-s ours) am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
...
* commit '863ee40964ef2a017a1116abe37c6b8ad466dd5e':
DO NOT MERGE Fix media scanner uri handling.
2011-05-04 12:46:57 -07:00
Mike Lockwood
20b571fd81
am 4397c324: (-s ours) am c535f7f2: DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
...
* commit '4397c3240240080cf17a1cd4dcaff87ab7cacb3a':
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
2011-05-04 12:46:52 -07:00
Mike Lockwood
56543aecfd
am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
...
* commit '21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb':
DO NOT MERGE MTP and media provider support for multiple storage devices:
2011-05-04 12:46:47 -07:00
Mike Lockwood
b281bb0bf7
am 20c35612: (-s ours) am 10fbba21: DO NOT MERGE MountService: Fix running media scanner at boot.
...
* commit '20c356128492cf43d9ca10308601be585514f165':
DO NOT MERGE MountService: Fix running media scanner at boot.
2011-05-04 12:46:42 -07:00
Mike Lockwood
3e9ea2f73d
am 2572051c: (-s ours) am 0aa5d7b7: DO NOT MERGE Fix deadlock in MountService
...
* commit '2572051c4f6589e5ca8b21158a24a7fa606a5e67':
DO NOT MERGE Fix deadlock in MountService
2011-05-04 12:46:36 -07:00
Mike Lockwood
b88a9ad107
am a2a8419d: (-s ours) am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
...
* commit 'a2a8419db82ae40146bdfd215e3de3be39c7249c':
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
2011-05-04 12:46:31 -07:00
Mike Lockwood
8421a0d794
am 60c768d4: (-s ours) am 346a2d79: DO NOT MERGE MountService: Add support for multiple volumes
...
* commit '60c768d41277e3b7d4988452e15694c7ad5a74d0':
DO NOT MERGE MountService: Add support for multiple volumes
2011-05-04 12:46:21 -07:00