Michael Jurka
|
5abd6ee84f
|
Merge "Fix NPE in Recent Apps"
|
2012-01-12 10:41:32 -08:00 |
|
Mathias Agopian
|
e8045dc60e
|
Merge "remove dead/usnused code"
|
2012-01-12 10:37:10 -08:00 |
|
Mathias Agopian
|
fcf6cd0421
|
Merge "Fix an issue with VSYNC"
|
2012-01-12 10:36:39 -08:00 |
|
Glenn Kasten
|
7ac21a7609
|
Merge "Use audio_format_t consistently"
|
2012-01-12 10:30:28 -08:00 |
|
Robert Greenwalt
|
8df26f89d8
|
am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '1800ccfa647cca6e9c051759312d6af12f134f5a':
Disable wimax when mobile data is in Settings
|
2012-01-12 09:29:30 -08:00 |
|
Robert Greenwalt
|
6215e2f133
|
am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
|
2012-01-12 09:26:48 -08:00 |
|
Robert Greenwalt
|
693628ea2c
|
Merge "Ignore case on apn type strings."
|
2012-01-12 09:25:25 -08:00 |
|
Robert Greenwalt
|
f0ece48909
|
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
|
2012-01-12 09:24:45 -08:00 |
|
The Android Open Source Project
|
84b066fddb
|
am ce77af47: Reconcile with ics-mr1-release
* commit 'ce77af47e979d365155e4003ca2943b639600e73':
|
2012-01-12 09:00:21 -08:00 |
|
The Android Open Source Project
|
c6c8d06ea8
|
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
|
2012-01-12 08:56:17 -08:00 |
|
Marco Nelissen
|
98db1598b9
|
Merge "MediaScanner: Disable bulk insert for settings"
|
2012-01-12 07:49:23 -08:00 |
|
Michael Jurka
|
c63c62e0ab
|
Merge "Speeding up System UI pressed anim"
|
2012-01-12 07:35:43 -08:00 |
|
Danielle Millett
|
79ba73dace
|
am 63faf6c6: (-s ours) am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '63faf6c66ff129da9e431dbafd1170a14aedb259':
DO NOT MERGE - Cherry picking from master to MR1
|
2012-01-12 07:33:47 -08:00 |
|
Danielle Millett
|
7c92558beb
|
am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
DO NOT MERGE - Cherry picking from master to MR1
|
2012-01-12 07:31:37 -08:00 |
|
Danielle Millett
|
178c4fbfe2
|
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
|
2012-01-12 07:28:24 -08:00 |
|
Brian Colonna
|
1f3c500feb
|
am 2cd0a0e5: (-s ours) am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
DO NOT MERGE cherry-picked FU framework tablet commits
|
2012-01-12 06:37:14 -08:00 |
|
Brian Colonna
|
4396642bd5
|
am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99':
DO NOT MERGE cherry-picked FU framework tablet commits
|
2012-01-12 06:35:27 -08:00 |
|
Brian Colonna
|
41e7472dad
|
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
|
2012-01-12 06:33:49 -08:00 |
|
Mathias Agopian
|
55ef343331
|
remove dead/usnused code
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
|
2012-01-11 22:03:41 -08:00 |
|
Mathias Agopian
|
a72d0db292
|
Fix an issue with VSYNC
one-shot VSYNC listeners could miss a VSYNC event if
scheduled while in waitForVsync().
Change-Id: I720485784aecfea6cc7a23c77081d7af3c9c71db
|
2012-01-11 22:03:40 -08:00 |
|
satok
|
b37021a362
|
Merge "Make public SpellChecker utilities"
|
2012-01-11 21:14:23 -08:00 |
|
Irfan Sheriff
|
94390d6942
|
Merge "Sync up state with supplicant at start"
|
2012-01-11 20:33:11 -08:00 |
|
Xia Wang
|
1556662f95
|
am 87badc20: am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '87badc20c7d5462ee27f13adf50acaf6a3232884':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
|
2012-01-11 17:57:16 -08:00 |
|
Xia Wang
|
0b22ec88d3
|
am b18a7c3e: am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
* commit 'b18a7c3ef1ff92ee2b8407743ffc4d7fd8b8ba70':
Get average value for image processing test bug#: 5566079
|
2012-01-11 17:57:14 -08:00 |
|
Xia Wang
|
61f0dd8594
|
am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
|
2012-01-11 17:53:38 -08:00 |
|
Xia Wang
|
ed46c6fc28
|
am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
Get average value for image processing test bug#: 5566079
|
2012-01-11 17:53:36 -08:00 |
|
Xia Wang
|
50bf48027e
|
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
|
2012-01-11 17:52:06 -08:00 |
|
Xia Wang
|
db412c81a9
|
Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
|
2012-01-11 17:51:48 -08:00 |
|
Katie McCormick
|
de67dfee13
|
am 3808f8cc: am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '3808f8ccec18f7b04ef983d553fb10f3e2983216':
Doc change: Adding Bluetooth HDP info.
|
2012-01-11 16:45:00 -08:00 |
|
Katie McCormick
|
f205ee30f3
|
am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
Doc change: Adding Bluetooth HDP info.
|
2012-01-11 16:42:29 -08:00 |
|
Katie McCormick
|
698d442697
|
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
|
2012-01-11 16:40:37 -08:00 |
|
John Reck
|
573c2cae96
|
Merge "Initial NavCache removal support"
|
2012-01-11 16:34:26 -08:00 |
|
The Android Automerger
|
c216f8edc5
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-11 16:29:04 -08:00 |
|
John Wang
|
3ce55ee868
|
am 70205788: am 6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '70205788fa39968b8331085597e3d3b61e271fbe':
Adjust the mapping of LTE signal bars.
|
2012-01-11 16:05:14 -08:00 |
|
Selim Gurun
|
6eaf101cf4
|
am 0265a4a0: (-s ours) am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '0265a4a0e02db98b85bd7f9be8b866d3fb9889d2':
Do Not Merge. Move ssl callbacks to webcore thread.
|
2012-01-11 16:04:55 -08:00 |
|
John Wang
|
6f6f4eed96
|
am 6ad68ba9: Adjust the mapping of LTE signal bars.
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
Adjust the mapping of LTE signal bars.
|
2012-01-11 15:36:00 -08:00 |
|
Selim Gurun
|
e835c3a6fe
|
am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
Do Not Merge. Move ssl callbacks to webcore thread.
|
2012-01-11 14:20:32 -08:00 |
|
Selim Gurun
|
d99d96e3dc
|
Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
|
2012-01-11 14:18:14 -08:00 |
|
Glenn Kasten
|
19f2cfe3ad
|
Merge "Fix build warnings"
|
2012-01-11 13:42:47 -08:00 |
|
Glenn Kasten
|
772b29ff49
|
Merge "Fix race in AudioSystem::getInputBufferSize"
|
2012-01-11 11:40:27 -08:00 |
|
Glenn Kasten
|
a9c933d3c7
|
Merge "Fix bug in JetPlayer::loadFromFile"
|
2012-01-11 11:39:06 -08:00 |
|
Glenn Kasten
|
a8d1a31585
|
Merge "Simplify range check for audio_mode_t"
|
2012-01-11 11:38:21 -08:00 |
|
Glenn Kasten
|
21777444e6
|
Merge "Fix build warnings"
|
2012-01-11 11:37:53 -08:00 |
|
Eric Laurent
|
a2e048e14a
|
am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '05985a2e2ae5c21fbf69d2884c59ea475fce7f6d':
stagefright: limit audio gap for looped playback
|
2012-01-11 11:14:30 -08:00 |
|
Eric Laurent
|
a63db7800e
|
am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
stagefright: limit audio gap for looped playback
|
2012-01-11 11:12:45 -08:00 |
|
Eric Laurent
|
85ed73d287
|
Merge "stagefright: limit audio gap for looped playback" into ics-mr1
|
2012-01-11 11:10:38 -08:00 |
|
Teng-Hui Zhu
|
a753afa801
|
Merge "Query the native side to decide to play when going into full screen mode"
|
2012-01-11 10:31:24 -08:00 |
|
Glenn Kasten
|
6208c19c33
|
Merge "Use correct type for hardware call state"
|
2012-01-11 10:25:23 -08:00 |
|
Glenn Kasten
|
7c12106db8
|
Merge "Declare IAudioTrack methods in binder opcode order"
|
2012-01-11 10:23:34 -08:00 |
|
Glenn Kasten
|
3c4fac9c59
|
Merge "Use consistent style of & reference for AutoMutex"
|
2012-01-11 10:23:04 -08:00 |
|