Bill Gruber
e90c25ec4e
Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
2011-11-15 10:57:32 -08:00
Adrian Ludwig
1aee13e0e4
Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
2011-11-15 10:37:28 -08:00
Danielle Millett
e37af76c12
Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0
2011-11-14 15:08:05 -08:00
Eric Fischer
643bf2c9c2
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-14 15:06:30 -08:00
Tsu Chiang Chuang
90e2e54c10
Merge "Adding mobile microbenchmark tests." into ics-mr0
2011-11-14 15:03:17 -08:00
Scott Main
16d152ce1d
Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
2011-11-11 17:17:23 -08:00
Adam Powell
eade6e88c7
Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances." into ics-mr0
2011-11-11 14:54:02 -08:00
Robert Ly
dba3ec9351
Merge "docs: ndk r7 rel notes" into ics-mr0
2011-11-11 12:06:39 -08:00
Svetoslav Ganov
3e3f24f8e3
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
2011-11-11 00:00:02 -08:00
Jamie Gennis
a371380db0
Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
2011-11-10 16:06:12 -08:00
Wink Saville
c21e69922e
Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
2011-11-10 07:20:55 -08:00
Dave Burke
91d3e052f5
Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
2011-11-09 23:58:09 -08:00
Dave Burke
1f62c75dd3
Actually 59 fps DO NOT MERGE
...
Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
2011-11-09 23:53:51 -08:00
Wink Saville
4424381fce
Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
2011-11-09 19:39:39 -08:00
Mathias Agopian
1761a32f2e
Set the WM refresh rate to 60 Hz for tuna devices only DO
...
NOT MERGE
This approach is TEMPORARY until we can do this properly.
Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
2011-11-09 16:01:07 -08:00
Eric Fischer
7818a16c82
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-09 15:15:42 -08:00
Robert Ly
341e1624ab
Merge "docs: update samples toc for rs sample" into ics-mr0
2011-11-09 13:23:34 -08:00
David Brown
561d427958
Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
2011-11-08 18:25:30 -08:00
Glenn Kasten
842caaa0af
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
2011-11-08 17:31:32 -08:00
Jake Hamby
9db7f39431
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
2011-11-08 13:22:34 -08:00
Brian Colonna
211e1d4227
Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
2011-11-08 12:51:36 -08:00
Dianne Hackborn
d119913c7f
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
2011-11-05 00:31:17 -07:00
Jeff Brown
93ff1f985e
Fix a leak in Parcel::writeBlob.
...
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04 19:26:03 -07:00
Robert Greenwalt
edc0bf5536
Merge "Start using IP tool for advanced routing." into ics-mr0
2011-11-04 15:53:37 -07:00
Dianne Hackborn
d0af48a2a4
Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
2011-11-04 14:00:21 -07:00
Dave Burke
e11ccb28d1
Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0
2011-11-03 21:59:20 -07:00
Wink Saville
de6499254b
Merge "Separate data stall detection and recovery from net stats." into ics-mr0
2011-11-03 21:26:35 -07:00
Eric Fischer
d6474254b8
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-02 16:17:03 -07:00
Katie McCormick
3ad9593529
Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
2011-11-02 15:42:18 -07:00
Irfan Sheriff
712fd592e0
Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
2011-11-02 14:37:19 -07:00
Robert Greenwalt
a90153f696
Merge "Ignore errors when untethering" into ics-mr0
2011-11-02 14:26:45 -07:00
Irfan Sheriff
cb8740f108
Merge "Specify component name for provisioning" into ics-mr0
2011-11-01 21:15:26 -07:00
Jeff Sharkey
a8f0322f70
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
2011-11-01 21:14:35 -07:00
Katie McCormick
84b955e66f
Merge "Doc Update: Update list of widget classes" into ics-mr0
2011-11-01 17:09:44 -07:00
Dima Zavin
2ea1501028
Merge "BatteryService(jni): properly handle read's return value" into ics-mr0
2011-11-01 15:29:42 -07:00
Robert Greenwalt
8782f962e6
Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
2011-11-01 13:27:56 -07:00
Fabrice Di Meglio
33ba0be0de
Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
2011-11-01 12:41:04 -07:00
The Android Open Source Project
0c60db0bec
Reconcile with ics-factoryrom-2-release
...
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
2011-11-01 10:08:15 -07:00
Jim Miller
de783e2fb6
Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
2011-11-01 00:47:44 -07:00
Chih-Chung Chang
a662648d66
Merge "Update camera continuous autofocus javadoc." into ics-mr0
2011-10-31 21:04:01 -07:00
Stephen Hines
4713ddbc33
Merge "Fix potential segfault in RS watchdog." into ics-mr0
2011-10-31 17:14:58 -07:00
The Android Automerger
50a0b7c3ad
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-10-31 16:47:11 -07:00
Eric Laurent
38b089498e
Merge "Fix volume indication in vibrate mode." into ics-mr0
2011-10-31 16:21:16 -07:00
Martijn Coenen
e87e3dddf7
Merge "Fix disableForegroundNdefPush crash." into ics-mr0
2011-10-31 15:53:08 -07:00
Svetoslav Ganov
89f0560d5f
Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
2011-10-31 13:28:57 -07:00
The Android Open Source Project
76c5c69255
Reconcile with ics-factoryrom-2-release
...
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
2011-10-31 12:43:39 -07:00
The Android Automerger
1b47eac28c
Revert "Improve the slow query instrumentation."
...
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
2011-10-30 13:56:11 -07:00
The Android Automerger
3186645df4
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-10-30 12:35:09 -07:00
The Android Automerger
30abcbd93d
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-10-28 20:40:07 -07:00
Amith Yamasani
001411885a
Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
2011-10-28 18:59:11 -07:00
