Robert Greenwalt
b947b40f21
Merge "Use the carrier-given dns addrs for tethering."
2011-12-12 14:02:02 -08:00
Raphael
65e3a8c971
am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
...
* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
2011-12-12 13:16:35 -08:00
Gilles Debunne
0bc83f24f0
am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
...
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
Fixed SpellCheckerSessions leak in TextView
2011-12-12 13:15:53 -08:00
Gilles Debunne
df7e6c5f4f
am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
...
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
Re-use SpanSets in TextLine
2011-12-12 13:15:46 -08:00
Joe Malin
aa932891f5
am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
...
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
DOC CHANGE: Package text and Formatter javadoc
2011-12-12 13:15:36 -08:00
Chia-chi Yeh
168eaf1481
am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
...
* commit 'fa71962fe4595f484071ac0deb23f68d44932d83':
VPN: delete the "abort" file before starting VPN daemons.
2011-12-12 13:15:34 -08:00
Raphael
afcfa2f23a
Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
2011-12-12 13:14:12 -08:00
Irfan Sheriff
568a6fce2a
am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
...
* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
Fix wifi bring up at boot up
2011-12-12 12:35:12 -08:00
Jake Hamby
49a5fc6c4d
am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
...
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
2011-12-12 12:35:09 -08:00
Matthew Xie
ecc1b9a994
am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
...
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
2011-12-12 12:09:13 -08:00
Matthew Xie
027bd44923
Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
2011-12-12 12:07:39 -08:00
Romain Guy
9e212ebc0f
Merge "Code cleanup"
2011-12-12 11:44:43 -08:00
Romain Guy
d3e5f4e5df
Merge "Free up resources by deleting shaders early on"
2011-12-12 11:44:32 -08:00
Eric Fischer
44644a1666
am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '386f208489d85d81755b64e92a84290953accfc0':
Import revised translations. DO NOT MERGE
2011-12-12 11:06:38 -08:00
Eric Fischer
0beca4d419
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-12 11:04:39 -08:00
Amith Yamasani
f074f7e101
Merge "Show the current stream's volume in the volume panel."
2011-12-12 09:56:26 -08:00
Andreas Huber
fc829f73a0
Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
2011-12-12 08:32:28 -08:00
The Android Open Source Project
6952dcd51d
Reconcile with ics-mr1-release
...
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
2011-12-12 07:59:17 -08:00
The Android Open Source Project
02f2cff12c
Merge from ics-mr1
...
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
2011-12-12 07:47:43 -08:00
Ben Murdoch
ddf9a54596
Merge "Clear the WebView picture when a new load starts."
2011-12-12 03:13:46 -08:00
Makoto Onuki
a5c08d1157
Merge "MCC detection fixes for CountryDetector"
2011-12-10 13:23:59 -08:00
Andreas Huber
6ddc5e610f
am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
...
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
Don't perform RTSP seeks right away but queue them for 200ms
2011-12-09 18:09:21 -08:00
Andreas Huber
93796f5124
am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
...
* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
2011-12-09 18:09:19 -08:00
Svetoslav Ganov
85bfd59774
am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
...
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
NumberPicker getting stuck if scroll wheel not wrapable.
2011-12-09 18:09:16 -08:00
Irfan Sheriff
20b65d5a8b
am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
...
* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
Handle emergency call back mode correctly
2011-12-09 18:09:07 -08:00
Gilles Debunne
9a02eaff39
am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
...
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
Make the Next key navigate between TextViews
2011-12-09 18:09:03 -08:00
Gilles Debunne
abc3f0ba7b
resolved conflicts for merge of 5371a165 to master
...
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
2011-12-09 18:06:34 -08:00
Claudia de Veaux
b7eb84f110
Merge "Edit to string to change "double-touch" to "double-tap" per standard language."
2011-12-09 16:42:11 -08:00
Steven Ross
d651ce7314
Merge "Checking whether screen is on in constructor fixes 5658742"
2011-12-09 16:28:39 -08:00
The Android Automerger
3f989e2d67
merge in ics-mr1-release history after reset to ics-mr1
2011-12-09 16:17:04 -08:00
Justin Ho
3a1fd1a624
am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
...
* commit '1cec30a182c1963beda4b6f11cfae9fa38061e68':
Quick settings icons updated to match ics style on tablet
2011-12-09 15:43:48 -08:00
Justin Ho
1504118362
Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
2011-12-09 15:42:10 -08:00
Jamie Gennis
988637e559
SurfaceTexture: fix a verbose-log compile error
...
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
2011-12-09 15:07:44 -08:00
Eric Fischer
1136e9bc2a
am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
Import revised translations. DO NOT MERGE
2011-12-09 14:58:10 -08:00
The Android Open Source Project
9c31b9e723
am abe0ed49: am 641a5624: Reconcile with ics-mr0-release
...
* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':
2011-12-09 14:58:07 -08:00
The Android Open Source Project
001e423026
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
...
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535 : Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535 : Lockscreen...
2011-12-09 14:57:48 -08:00
Nick Pelly
3a51491c7e
Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"
2011-12-09 14:37:05 -08:00
Nick Pelly
bcf60e2fb3
Merge "Fix BasicNfcEeTest java package."
2011-12-09 14:36:23 -08:00
Gilles Debunne
73f964f15e
am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
...
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
IOOB is Suggestions
2011-12-09 14:25:55 -08:00
Gilles Debunne
2d288fd5a5
am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
...
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
Prevent NPE in SuggestionSpan
2011-12-09 14:25:53 -08:00
Jeff Tinker
bdb7342098
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
...
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-09 14:25:49 -08:00
Jeff Brown
f1154c79c1
am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
...
* commit '03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.
2011-12-09 14:25:41 -08:00
Jeff Brown
10fc3b07a0
am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
...
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
Fix system hotkey handling.
2011-12-09 14:25:38 -08:00
Jack Palevich
5cf2844870
Merge "Fix convert8To4, convert8To5"
2011-12-09 14:19:39 -08:00
Jack Palevich
2b93f0bf44
Fix convert8To4, convert8To5
...
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.
Fixes b/5680952
Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
2011-12-09 14:06:07 -08:00
Irfan Sheriff
992f67b2c5
Merge "Change RSSI notification levels to 5 in framework"
2011-12-09 12:43:28 -08:00
Romain Guy
f647099b58
Merge "Enable dirty regions on newly created EGL surfaces"
2011-12-09 12:28:46 -08:00
Jeff Tinker
326de23854
am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
...
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
2011-12-09 11:13:39 -08:00
Jeff Tinker
7052519a97
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
2011-12-09 11:11:56 -08:00
Joe Fernandez
0de9fa469d
am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
...
* commit '4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
2011-12-09 10:47:59 -08:00