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
Justin Ho
d7c7bb65e7
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
2010-11-15 09:10:33 -08:00
Justin Ho
22338c4ddc
am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'dc04f53703f68f0a4fb13858cbf71b760cf48368':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:57:11 -08:00
Justin Ho
71dd0387c2
am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:53:56 -08:00
Justin Ho
793bd745e3
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
2010-11-15 08:50:19 -08:00
Mike Lockwood
ccf2280766
Merge "MediaScanner: Add support for importing file based playlists copied over MTP"
2010-11-15 08:39:00 -08:00
James Dong
efee5581b7
Merge "Disable flaky streaming server check"
2010-11-15 08:13:30 -08:00
James Dong
9cb03e055e
Merge "Fix a typo in LOG_TAG for MediaPlayer unit tests"
2010-11-15 08:11:32 -08:00
Ben Murdoch
3f34e9a459
Merge "Stop loading if the user cancels the SSL certificate warning dialog"
2010-11-15 02:33:50 -08:00
Adam Powell
ae8502761e
Merge "Revised assets for progress bars and indeterminate progress spinners."
2010-11-12 19:19:19 -08:00
Megha Joshi
b06b0c421b
am 7bcccece: (-s ours) am e2ef2c10: Fixing build (DO NOT MERGE)
...
* commit '7bcccece88734fb714c417d9d263065212f59d24':
Fixing build (DO NOT MERGE)
2010-11-12 19:16:06 -08:00
Megha Joshi
561c3ae486
am e2ef2c10: Fixing build (DO NOT MERGE)
...
* commit 'e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
Fixing build (DO NOT MERGE)
2010-11-12 19:13:35 -08:00
Megha Joshi
36f67fae21
am 7e059716: (-s ours) am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '7e059716923cd02a4c42751c67892e090bfd5f33':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:48:56 -08:00
Megha Joshi
602ae138da
am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:46:38 -08:00