Justin Ho
|
849c08b732
|
Merge "New out-of-service RSSI." into ics-mr1
|
2012-01-20 14:33:07 -08:00 |
|
Dianne Hackborn
|
e2b2ee959a
|
Merge "Fix issue #5823276 again: home repaints after full-screen app is exited" into ics-mr1
|
2012-01-20 12:01:51 -08:00 |
|
Daniel Sandler
|
cec0a8e6a4
|
Merge "Always show appropriate mobile service label." into ics-mr1
|
2012-01-20 11:28:44 -08:00 |
|
Jeff Brown
|
2c0b7fbafa
|
Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
|
2012-01-20 11:24:13 -08:00 |
|
Jeff Brown
|
0428b94c03
|
Merge "Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)" into ics-mr1
|
2012-01-20 11:24:01 -08:00 |
|
The Android Automerger
|
7f7c63fcee
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-19 16:28:56 -08:00 |
|
Justin Ho
|
f0153a3004
|
Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1
|
2012-01-19 15:43:19 -08:00 |
|
Robert Ly
|
75a4189c2e
|
resolved conflicts for merge of b078d942 to ics-mr1
Change-Id: I831c06f2c198cc8825788a05770397457e8d511c
|
2012-01-19 13:25:07 -08:00 |
|
Robert Ly
|
90bb222c3e
|
am 9575a1ab: Merge "docs: wifi direct" into ics-mr0
* commit '9575a1ab5d033248284d59b2a2ae6eda80f79762':
docs: wifi direct
|
2012-01-19 10:41:28 -08:00 |
|
Robert Ly
|
75991b50d8
|
Merge "docs: wifi direct" into ics-mr0
|
2012-01-19 10:38:51 -08:00 |
|
The Android Automerger
|
73ca18b8f2
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-18 21:17:55 -08:00 |
|
Jim Miller
|
b82dd313e7
|
Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
|
2012-01-18 16:44:52 -08:00 |
|
Eric Laurent
|
3571f22afd
|
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
|
2012-01-18 16:05:31 -08:00 |
|
Wink Saville
|
9b4e98aa15
|
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
|
2012-01-18 16:03:24 -08:00 |
|
Adam Powell
|
9d40d1e8d0
|
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
|
2012-01-18 14:47:20 -08:00 |
|
Robert Ly
|
103e20348e
|
Merge "docs: adding rs api docs" into ics-mr1
|
2012-01-18 13:18:11 -08:00 |
|
Robert Ly
|
140608dd28
|
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
|
2012-01-18 13:17:51 -08:00 |
|
Joe Fernandez
|
617d0b0488
|
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
|
2012-01-18 12:33:45 -08:00 |
|
Scott Main
|
37a79cfbec
|
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
|
2012-01-13 18:23:40 -08:00 |
|
Scott Main
|
3d3293b131
|
Merge "docs: mention x86 as a native platform filter" into ics-mr1
|
2012-01-13 18:21:42 -08:00 |
|
Dianne Hackborn
|
55f960feb3
|
Merge "Update notification documentation to follow current guidelines." into ics-mr1
|
2012-01-13 16:36:05 -08:00 |
|
The Android Automerger
|
9eb6f85cb5
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-13 16:18:17 -08:00 |
|
Kenny Root
|
f39fc5a881
|
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
|
2012-01-13 13:11:02 -08:00 |
|
Dianne Hackborn
|
6393739ea4
|
Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1
|
2012-01-13 12:56:40 -08:00 |
|
Bart Sears
|
0667548a8a
|
Merge "Update to latest version of Roboto" into ics-mr1
|
2012-01-13 12:32:43 -08:00 |
|
Christopher Tate
|
cab5000317
|
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
|
2012-01-13 11:49:20 -08:00 |
|
John Huang
|
f5114c03de
|
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
|
2012-01-13 11:37:15 -08:00 |
|
Robert Ly
|
c61fa6848c
|
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
|
2012-01-13 10:13:14 -08:00 |
|
Scott Main
|
8e9e63253e
|
Merge "docs: make AD logo clickable on home page" into ics-mr1
|
2012-01-12 15:44:53 -08:00 |
|
Chia-chi Yeh
|
41e18e335b
|
Merge "VPN: silence VPN notifications." into ics-mr1
|
2012-01-12 14:24:30 -08:00 |
|
The Android Automerger
|
50f402c4a8
|
merge in ics-mr1-release history after reset to ics-mr1
|
2012-01-12 14:01:29 -08:00 |
|
Roman Nurik
|
be0ede7010
|
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
|
2012-01-12 12:45:00 -08:00 |
|
Jim Miller
|
32bfab04c4
|
Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
|
2012-01-12 12:28:59 -08:00 |
|
Daniel Sandler
|
6d810d88f8
|
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
|
2012-01-12 11:38:39 -08:00 |
|
Matthew Xie
|
82ba232b50
|
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
|
2012-01-12 11:24:06 -08:00 |
|
Scott Main
|
dab211a8d5
|
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
|
2012-01-12 11:22:24 -08:00 |
|
Scott Main
|
0775fc7f0c
|
Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
|
2012-01-12 11:19:08 -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 |
|
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
|
41e7472dad
|
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
|
2012-01-12 06:33:49 -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
|
698d442697
|
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
|
2012-01-11 16:40:37 -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 |
|
Selim Gurun
|
d99d96e3dc
|
Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
|
2012-01-11 14:18:14 -08:00 |
|
Eric Laurent
|
85ed73d287
|
Merge "stagefright: limit audio gap for looped playback" into ics-mr1
|
2012-01-11 11:10:38 -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
|
0dc1f704b2
|
Merge "Android Design" into ics-mr1
|
2012-01-10 17:01:45 -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
|
2f6fcb2893
|
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
|
2012-01-10 10:28:21 -08:00 |
|