Eric Rowe
6452964528
Merge "Remove asserts in bluetooth test utils"
2010-11-16 10:41:11 -08:00
Eric Rowe
0fd0014b3d
Merge "Add acceptPair method to BT stress."
2010-11-16 10:39:24 -08:00
Adam Powell
7df2356652
Merge "Fix bug 3198503 - NPE at MenuPopupHelper.dismiss"
2010-11-16 10:27:54 -08:00
Adam Powell
9841e563d2
Merge "Add protection for ActionMode-related window callbacks that may not implement new methods."
2010-11-16 10:18:04 -08:00
Brad Fitzpatrick
cea7f2f791
am 8443dd16: am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
...
* commit '8443dd16c2dfd5f56e33fbe76129f56e6a83b23e':
DropBox: Read until the end of stream has been reached
2010-11-16 09:40:52 -08:00
Brad Fitzpatrick
ce3408965f
am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
...
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
DropBox: Read until the end of stream has been reached
2010-11-16 09:37:56 -08:00
Brad Fitzpatrick
4a8dad92bb
Merge "DropBox: Read until the end of stream has been reached"
2010-11-16 09:22:31 -08:00
Xia Wang
120bde3470
am f55c9736: am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
...
* commit 'f55c973637f2b17de0f5543260e7e409a8635112':
Add Wi-Fi connection functional tests.
2010-11-16 09:18:48 -08:00
Xia Wang
4f5ba34a57
am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
...
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
Add Wi-Fi connection functional tests.
2010-11-16 09:16:54 -08:00
Xia Wang
7da37c0bdd
Merge "Add Wi-Fi connection functional tests." into gingerbread
2010-11-16 09:14:46 -08:00
James Dong
f2eb08d808
Merge "Add initial stereo capture support for AAC encoder"
2010-11-15 17:59:42 -08:00
Joe Onorato
f911a4efb3
Merge "Add the quick settings panel. There's currently nothing in it."
2010-11-15 17:48:33 -08:00
Vasu Nori
6a55f12ffd
Merge "another bug introduced by some previous refactoring CL"
2010-11-15 17:30:00 -08:00
Stephen Hines
f00cdab0b8
Merge "Remove WARs for zero-init + destructors."
2010-11-15 17:19:26 -08:00
Michael Jurka
25e98529a3
Merge "Fix issue where Launcher was not getting redrawn"
2010-11-15 17:01:54 -08:00
Adam Powell
c73fb8ef35
Merge "Fix a couple interactions between action bar and options menus"
2010-11-15 16:49:35 -08:00
Joe Onorato
78f98a78a0
Merge "use the proper number of wifi icon levels."
2010-11-15 16:39:24 -08:00
Joe Onorato
45c8b12384
Merge "Don't crash if we haven't gotten a signal strength yet."
2010-11-15 15:35:58 -08:00
Andreas Huber
908c0240b7
Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."
2010-11-15 15:31:17 -08:00
Adam Powell
7638a06014
Merge "Fix bug 3176330 - Improve documentation around MenuItem.setShowAsAction"
2010-11-15 15:26:31 -08:00
Gilles Debunne
20c87e3090
Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread"
2010-11-15 15:23:01 -08:00
Joe Onorato
52ec89cfd9
Merge "Don't cancel the key buttons when you drag outside their bounds."
2010-11-15 13:32:43 -08:00
James Dong
5099723fbd
Merge "Fixed a race condition where some recording frames may not be released."
2010-11-15 13:31:54 -08:00
Wink Saville
4236435184
Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory."
2010-11-15 13:24:37 -08:00
Vasu Nori
cb77985245
Merge "map _data column to local_filename column. bug:3197501"
2010-11-15 13:24:23 -08:00
Mathias Agopian
403ac4dec0
am f11bf284: am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
...
* commit 'f11bf284d355e2a8378c6a37a7ed702705ec6144':
Fix a race condition in sensormanager
2010-11-15 13:22:16 -08:00
Mathias Agopian
409ec01a4d
am 99866c11: am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
...
* commit '99866c111bd72a6cc9be17b127cd40ec9396ca7d':
Revert "allow all 4 orientations"
2010-11-15 13:22:13 -08:00
Mathias Agopian
83da32bb74
am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
...
* commit '305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
2010-11-15 13:19:46 -08:00
Mathias Agopian
fc2aa31e63
am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
...
* commit '9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
2010-11-15 13:19:43 -08:00
Derek Sollenberger
18472f3959
Merge "Only show double-tap tip if the feature is enabled."
2010-11-15 13:19:37 -08:00
Mathias Agopian
038d998774
Merge "Fix a race condition in sensormanager" into gingerbread
2010-11-15 13:14:59 -08:00
Mathias Agopian
ce6ef64c5b
Merge "Revert "allow all 4 orientations"" into gingerbread
2010-11-15 13:14:50 -08:00
Joe Onorato
922bbf79e8
Merge "The beginnings of the new status bar."
2010-11-15 12:23:51 -08:00
James Dong
5c43df3498
Merge "Switch to use kKeyFrameRate for recordvideo utility"
2010-11-15 12:13:08 -08:00
Brad Fitzpatrick
568355c44e
Merge "Close some things in system_server that CloseGuard found."
2010-11-15 11:31:05 -08:00
Mike Lockwood
3923293d37
Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList"
2010-11-15 11:27:47 -08:00
Kenny Root
7986fe5035
Merge "Split UTF functions from String8/16"
2010-11-15 11:11:22 -08:00
Adam Cohen
d0834f730a
Merge "Fix for Issue: 3196583"
2010-11-15 11:09:59 -08:00
Wink Saville
edae3f3887
Merge "Add html formatting to AsyncChannel & Hsm class comments."
2010-11-15 11:00:49 -08:00
Brad Fitzpatrick
5e08bc3db3
Merge "Disable CloseGuard early. (it defaults to spammy otherwise)"
2010-11-15 10:47:49 -08:00
Brad Fitzpatrick
5e8887db6a
Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"
2010-11-15 10:47:32 -08:00
Andreas Huber
87558766fb
Merge "More HTTP live support, AES encryption etc."
2010-11-15 10:07:38 -08:00
Andreas Huber
47ad585fe3
Merge "Refactor h.264 profile/level support into avc_utils."
2010-11-15 10:07:31 -08:00
Andreas Huber
52868f758c
Merge "Provide bandwidth estimation support in NuHTTPDataSource"
2010-11-15 10:07:24 -08:00
Andreas Huber
cfa1bf4097
Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
2010-11-15 10:07:17 -08:00
Adam Cohen
981e2def17
Merge "Adding click feedback to StackView"
2010-11-15 10:05:58 -08:00
James Dong
046ba44980
Merge "Remove legacy PV stuff"
2010-11-15 09:57:33 -08:00
Mike Lockwood
1b1c617819
Merge "MTP: Partial implementation of the GetObjectPropList command"
2010-11-15 09:51:10 -08:00
Justin Ho
a54ca1b4a0
am b9d3e359: (-s ours) am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit 'b9d3e35907e6b7e2c766f4813ab2e0463c920c37':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:16:13 -08:00
Justin Ho
623d4d5251
am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit '868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:13:16 -08:00