The Android Automerger
2f30ae90e6
merge in ics-mr0-release history after reset to ics-mr0
2011-11-17 06:28:25 -08:00
Matthew Xie
e8b051d904
Merge "Check the bluetooth state for getUuid call" into ics-mr0
2011-11-16 15:31:03 -08:00
The Android Open Source Project
9e566e2616
Reconcile with ics-factoryrom-2-release
...
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
2011-11-16 08:55:43 -08:00
The Android Automerger
98dcfe2647
merge in ics-mr0-release history after reset to ics-mr0
2011-11-15 19:08:44 -08:00
Jake Hamby
cf56976015
Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
2011-11-15 13:34:58 -08:00
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
The Android Automerger
0012066e10
merge in ics-mr0-release history after reset to ics-mr0
2011-11-14 17:11:43 -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
The Android Automerger
74604cc7ff
merge in ics-mr0-release history after reset to ics-mr0
2011-11-13 06:28:23 -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
The Android Automerger
0364cec4ba
merge in ics-mr0-release history after reset to ics-mr0
2011-11-11 14:46:55 -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
The Android Automerger
3567094785
merge in ics-mr0-release history after reset to ics-mr0
2011-11-10 06:28:33 -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
The Android Automerger
d8be24e84b
merge in ics-mr0-release history after reset to ics-mr0
2011-11-09 06:28:43 -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
The Android Automerger
771c2ba2bf
merge in ics-mr0-release history after reset to ics-mr0
2011-11-08 06:41:10 -08:00
The Android Automerger
0689c381b7
merge in ics-mr0-release history after reset to ics-mr0
2011-11-06 06:28:19 -08:00
The Android Automerger
d17aaaee47
merge in ics-mr0-release history after reset to ics-mr0
2011-11-05 00:33:21 -07: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
06234b37e3
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 22:16:39 -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
The Android Automerger
31f4de3e67
merge in ics-mr0-release history after reset to ics-mr0
2011-11-04 15:40:13 -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
The Android Automerger
fd4f0cdc3a
merge in ics-mr0-release history after reset to ics-mr0
2011-11-03 06:33:29 -07:00
The Android Automerger
e8dc810f7c
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02 20:58:00 -07:00
The Android Automerger
e4af9b8ecf
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-11-02 20:53:06 -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
The Android Automerger
7e3626866f
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-11-02 10:05:33 -07:00
