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 |
|
Glenn Kasten
|
c1cb740868
|
Merge "Fix missing tag in mediaserver ServiceManager: log"
|
2012-01-11 10:22:45 -08:00 |
|
Glenn Kasten
|
d72dbd8002
|
Merge "AudioFlinger new can't fail"
|
2012-01-11 10:22:19 -08:00 |
|
Glenn Kasten
|
7e8c52d693
|
Merge "Fix build warning"
|
2012-01-11 10:01:34 -08:00 |
|
Narayan Kamath
|
5873400ac8
|
Merge "Write unit tests for android.speech.tts."
|
2012-01-11 03:39:57 -08:00 |
|
Steve Block
|
eea80b9330
|
Merge "Remove some stale TODOs from the Java Bridge tests"
|
2012-01-11 03:14:29 -08:00 |
|
satok
|
e7227cc9be
|
Merge "Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard Bug: 5806103"
|
2012-01-11 01:52:50 -08:00 |
|
Roman Nurik
|
80136b5a58
|
am 4ada9c6f: am c894fb7e: Prevent Android Design sidenav links from opening a new window
* commit '4ada9c6f3e8911d837820c483b588b430b06e6d3':
Prevent Android Design sidenav links from opening a new window
|
2012-01-11 00:24:36 -08:00 |
|
Roman Nurik
|
b7de5dd80b
|
am c894fb7e: Prevent Android Design sidenav links from opening a new window
* commit 'c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
Prevent Android Design sidenav links from opening a new window
|
2012-01-11 00:21:41 -08:00 |
|
Scott Main
|
4a47cd21d3
|
am 25b772f3: am acd152f0: docs: editorial fix to homepage
* commit '25b772f357d79ddf39c69541839465a9fd2cbf39':
docs: editorial fix to homepage
|
2012-01-10 21:16:08 -08:00 |
|
Scott Main
|
d8ec891580
|
am acd152f0: docs: editorial fix to homepage
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
docs: editorial fix to homepage
|
2012-01-10 21:13:38 -08:00 |
|
Jeff Sharkey
|
f0c7552b4b
|
Merge "Move non-monotonic reporting to interface."
|
2012-01-10 17:41:01 -08:00 |
|
Scott Main
|
bbeee598b2
|
am 7cffe2c6: am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '7cffe2c66815fcd2c5dc4579ed964901bc17b431':
docs: add links to Android Design from dev docs
|
2012-01-10 17:12:25 -08:00 |
|
Scott Main
|
65aba416a7
|
am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1
* commit '05fc9f655aaa01cdb38229d1dc6155a341fa316b':
docs: add links to Android Design from dev docs
|
2012-01-10 17:10:28 -08:00 |
|
Scott Main
|
93e7348d94
|
Merge "docs: add links to Android Design from dev docs" into ics-mr1
|
2012-01-10 17:08:19 -08:00 |
|
Roman Nurik
|
3726ce85af
|
am 3d0891d1: am 548972d7: Merge "Android Design" into ics-mr1
* commit '3d0891d18782451e2b1461b0bd13ff6f28736d69':
Android Design
|
2012-01-10 17:06:59 -08:00 |
|
Roman Nurik
|
28288d6535
|
am 548972d7: Merge "Android Design" into ics-mr1
* commit '548972d798f06c91cb8cba6716952322da97ac21':
Android Design
|
2012-01-10 17:04:05 -08:00 |
|
Roman Nurik
|
0dc1f704b2
|
Merge "Android Design" into ics-mr1
|
2012-01-10 17:01:45 -08:00 |
|
Ying Wang
|
ae36d6f15b
|
Merge "Build all test apks as raw resource in FrameworksCoreTests."
|
2012-01-10 16:37:43 -08:00 |
|
Steve Block
|
a5288870d4
|
Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"
|
2012-01-10 14:08:32 -08:00 |
|
Scott Main
|
5b630b8b9a
|
am 5a3e67c7: am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1
* commit '5a3e67c7811d4a7906548e113561cd1e901de9e2':
docs: fix broken links in .jd docs
|
2012-01-10 12:58:03 -08:00 |
|
Scott Main
|
fca2839770
|
am d1186cd5: Merge "docs: fix broken links in .jd docs" into ics-mr1
* commit 'd1186cd5bb445e9b0768edf6cb87022865cada55':
docs: fix broken links in .jd docs
|
2012-01-10 12:55:36 -08:00 |
|
Scott Main
|
5fbad363f1
|
Merge "docs: fix broken links in .jd docs" into ics-mr1
|
2012-01-10 12:53:42 -08:00 |
|
Jim Miller
|
0b0a5dc8aa
|
am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
Fix 4560303: Add setting to lock later when power button pressed
|
2012-01-10 10:34:51 -08:00 |
|
Jim Miller
|
e597102c47
|
am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '62fad7689567bed6ec372401c1b171659c28572d':
Fix 4560303: Add setting to lock later when power button pressed
|
2012-01-10 10:30:41 -08:00 |
|
Jim Miller
|
2f6fcb2893
|
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
|
2012-01-10 10:28:21 -08:00 |
|
Pin Ting
|
fc86e54538
|
am 06e617f5: am 497661d3: Merge "Fixes typo." into ics-mr1
* commit '06e617f5a6f68ca99118268eb7361bb1e5ade0a5':
Fixes typo.
|
2012-01-09 19:03:07 -08:00 |
|
Pin Ting
|
e846922266
|
am 497661d3: Merge "Fixes typo." into ics-mr1
* commit '497661d309ea960aa9723ef4e0d064b56515b566':
Fixes typo.
|
2012-01-09 19:00:16 -08:00 |
|
Pin Ting
|
98f6fa54ac
|
Merge "Fixes typo." into ics-mr1
|
2012-01-09 18:58:13 -08:00 |
|