The Android Automerger
a2efd2ed08
merge in gingerbread-release history after reset to gingerbread
2011-05-13 14:27:46 -07:00
Irfan Sheriff
ea08a66129
Merge "Move Wifi Ap configuration to flat file" into gingerbread
2011-05-11 09:15:48 -07:00
Jake Hamby
f068f4f487
Merge "Enable support for SMS national language shift tables." into gingerbread
2011-05-05 13:09:11 -07:00
The Android Automerger
7f6580c6b7
merge in gingerbread-release history after reset to gingerbread
2011-04-01 13:28:17 -07:00
Jason parks
bef49808c7
Merge "Implement teardown script." into gingerbread
2011-04-01 13:11:06 -07:00
James Dong
2688dddfd2
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
2011-03-31 11:20:40 -07:00
The Android Automerger
1e0616eb70
merge in gingerbread-release history after reset to gingerbread
2011-03-30 18:33:05 -07:00
Eric Laurent
ce75529174
Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
2011-03-30 14:55:49 -07:00
Mike Lockwood
6de2e32fd3
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
2011-03-30 14:15:51 -07:00
Trevor Johns
e4e971ee13
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
2011-03-30 13:50:40 -07:00
Simon Wilson
ae9739aec3
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
2011-03-30 13:26:45 -07:00
Eric Fischer
8ee2f9df92
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-30 10:41:05 -07:00
Jason parks
00607ddaee
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
2011-03-30 08:17:53 -07:00
Jean-Baptiste Queru
825370ebef
No-op - reconcile with open-source gingerbread
...
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
2011-03-29 14:05:53 -07:00
Michael I. Gold
894c1459c1
egl: fixes for object refcounts
...
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-03-29 13:43:54 -07:00
The Android Automerger
1a4a9bf6e0
merge in gingerbread-release history after reset to gingerbread
2011-03-28 16:31:27 -07:00
The Android Automerger
b0bd3f0285
merge in gingerbread-release history after reset to gingerbread
2011-03-28 05:44:08 -07:00
Robert Greenwalt
f9a75b96bd
Merge "Fix Default route after secondary net use." into gingerbread
2011-03-26 08:58:01 -07:00
The Android Automerger
8c765ab809
merge in gingerbread-release history after reset to gingerbread
2011-03-25 22:26:02 -07:00
Jeff Hamilton
fbf4a75c57
Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
2011-03-25 14:53:14 -07:00
The Android Automerger
f23c437c8e
merge in gingerbread-release history after reset to gingerbread
2011-03-25 14:32:36 -07:00
Irfan Sheriff
fce4eab91a
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
2011-03-25 11:01:02 -07:00
Robert Greenwalt
9028577960
Merge "Fix some alt-network issues." into gingerbread
2011-03-25 09:35:53 -07:00
The Android Automerger
af24ae9fbd
merge in gingerbread-release history after reset to gingerbread
2011-03-25 06:04:52 -07:00
The Android Automerger
2e624a0818
merge in gingerbread-release history after reset to gingerbread
2011-03-24 08:49:17 -07:00
The Android Automerger
1d5df9a451
merge in gingerbread-release history after reset to gingerbread
2011-03-23 05:43:33 -07:00
The Android Automerger
c2520c3e11
merge in gingerbread-release history after reset to gingerbread
2011-03-22 13:10:41 -07:00
Nick Pelly
54b76288d4
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
2011-03-22 09:52:55 -07:00
The Android Automerger
1bf20cfc02
merge in gingerbread-release history after reset to gingerbread
2011-03-22 05:43:42 -07:00
Simon Wilson
3614b4772e
Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
2011-03-21 16:58:41 -07:00
Fred Quintana
3e4bb01174
Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
2011-03-21 11:04:23 -07:00
The Android Automerger
987f54006d
merge in gingerbread-release history after reset to gingerbread
2011-03-21 05:42:44 -07:00
The Android Automerger
2a7866537d
merge in gingerbread-release history after reset to gingerbread
2011-03-18 17:35:46 -07:00
Eric Fischer
d2cd24d8ce
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-18 15:22:05 -07:00
The Android Automerger
c6b4c64e37
merge in gingerbread-release history after reset to gingerbread
2011-03-18 10:42:06 -07:00
Valentin Kravtsov
16f5cc4c58
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Xia Wang
0d2b3fe91d
Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
2011-03-17 15:06:40 -07:00
The Android Automerger
a5f48c94b6
merge in gingerbread-release history after reset to gingerbread
2011-03-17 05:44:05 -07:00
Simon Wilson
2d0c7bfc6a
Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
2011-03-16 19:51:07 -07:00
The Android Automerger
a39c4085a3
merge in gingerbread-release history after reset to gingerbread
2011-03-16 05:43:58 -07:00
Dianne Hackborn
9db5a3473f
Merge "Improve error reporting for issue #3183612 " into gingerbread
2011-03-15 14:40:56 -07:00
Mike Lockwood
79ae55e051
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
2011-03-15 14:04:54 -07:00
Xavier Ducrohet
124eb84c5e
Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
2011-03-15 11:29:16 -07:00
Xavier Ducrohet
1d0284b613
Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
2011-03-15 11:29:07 -07:00
Dianne Hackborn
bebc96ba62
Merge "Add some debug code to try to track down issue 3183612" into gingerbread
2011-03-15 10:29:04 -07:00
The Android Automerger
c0264f0545
merge in gingerbread-release history after reset to gingerbread
2011-03-14 22:34:01 -07:00
Mike Lockwood
d24c514601
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
2011-03-14 13:17:24 -07:00
Simon Wilson
82333c550e
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
2011-03-14 11:40:17 -07:00
Daniel Sandler
d0dca10d5d
Merge "Workaround unknown ERI indices." into gingerbread
2011-03-14 11:37:12 -07:00
Gilles Debunne
d567127f0a
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
2011-03-14 11:30:17 -07:00
