Jean Chalard
cdeec915cd
Merge "Fix a warning from the binder, step 2."
2011-10-20 05:36:26 -07:00
Jean Chalard
2f69cae4a4
Merge "Fix a warning from the binder, step 3."
2011-10-20 05:26:29 -07:00
Dave Burke
15ecb5636f
am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
...
* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
Stagefright: idle OMX after ANW errors
2011-10-19 22:38:45 -07:00
Dave Burke
3b3bc00202
Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
2011-10-19 22:37:18 -07:00
Winson Chung
9966ca02bc
am 44630c72: Merge "Updating the screenshot notification icons." into ics-mr0
...
* commit '44630c72651803ba1dedba3b5352cad8a8a62ace':
Updating the screenshot notification icons.
2011-10-19 21:39:31 -07:00
Winson Chung
13228830dd
Merge "Updating the screenshot notification icons." into ics-mr0
2011-10-19 21:36:32 -07:00
Svetoslav Ganov
db00d3936a
am 5dc30a77: Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
...
* commit '5dc30a770ab1b4f07ff10502f9de9ec39daac41d':
DatePicker crashes when going from 2036 to 2035 via ▼
2011-10-19 21:17:14 -07:00
Svetoslav Ganov
976161cc6f
Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
2011-10-19 21:15:30 -07:00
Jim Miller
f14ab8db48
am 2f35281a: Merge "Fix 5485925: Fix crash in transport control view" into ics-mr0
...
* commit '2f35281ae0ae4471527e9286f022cb960384044e':
Fix 5485925: Fix crash in transport control view
2011-10-19 20:50:45 -07:00
Jim Miller
8629ede03a
Merge "Fix 5485925: Fix crash in transport control view" into ics-mr0
2011-10-19 20:49:33 -07:00
Chih-Chung Chang
851743dcd7
am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced
...
* commit 'f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
Fix 5487571: Make sure shutter sound is played when it's enforced
2011-10-19 20:09:13 -07:00
Maarten Hooft
240d3a621b
am d47d4f7b: Merge "Add a delay before walled garden test" into ics-mr0
...
* commit 'd47d4f7b7713a4a05da7ea55c3e698b939fe81b1':
Add a delay before walled garden test
2011-10-19 18:23:20 -07:00
Maarten Hooft
60b195831c
Merge "Add a delay before walled garden test" into ics-mr0
2011-10-19 18:21:56 -07:00
Svetoslav Ganov
bea249e4ca
am 06044fe1: Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
...
* commit '06044fe114f7f07c15b0ba92740829cb8896766b':
AccessibilityServiceInfo does not report properly the feedback type.
2011-10-19 18:18:44 -07:00
Svetoslav Ganov
980cb0421c
Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
2011-10-19 18:15:52 -07:00
Daniel Sandler
8b3fc251f2
am 84e825a8: Merge "Add hasNavigationBar() to the window manager." into ics-mr0
...
* commit '84e825a84d7dde03042228c79638935c92d13c92':
Add hasNavigationBar() to the window manager.
2011-10-19 18:07:18 -07:00
Dirk Dougherty
6ac4448391
am 62ade220: Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
...
* commit '62ade220d9b72a9edc8fcc4dfe98ca9541c6d501':
Doc change: add video to platform highlights and fix a few things.
2011-10-19 18:07:16 -07:00
Daniel Sandler
7400a5a52c
Merge "Add hasNavigationBar() to the window manager." into ics-mr0
2011-10-19 18:05:20 -07:00
Dirk Dougherty
e20950052c
Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
2011-10-19 18:05:18 -07:00
James Dong
d79306e4ad
am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
...
* commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
2011-10-19 17:57:58 -07:00
James Dong
35c9945aa5
Merge "Check whether media recorder client exists before dumping." into ics-mr0
2011-10-19 17:55:45 -07:00
Dianne Hackborn
d72f4bcce3
am 16362041: Merge "Fix issue #5484096 : Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
...
* commit '163620417bc2980528e2079e3456c9600a92e165':
Fix issue #5484096 : Device rebooted after turning WiFi tethering ON, IRL19 Crespo.
2011-10-19 17:17:29 -07:00
Dianne Hackborn
709adab040
Merge "Fix issue #5484096 : Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
2011-10-19 17:15:39 -07:00
Romain Guy
c6d209c8bb
Merge "Correctly dump DrawPatch operations in display lists"
2011-10-19 17:07:25 -07:00
Peter Ng
23bc8ddbb8
Merge "Fixing blurry textfields"
2011-10-19 16:55:54 -07:00
Wink Saville
bc10e5a6f7
Merge "Non-default link should be cleaned up on telephony db change."
2011-10-19 16:27:32 -07:00
Svetoslav Ganov
ce662d1d28
am 018cb119: Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
...
* commit '018cb119bca7a3a08dd59843e1fec9a3027a8133':
AdapterView does not check for null adapter when initializing accessibility event.
2011-10-19 15:53:28 -07:00
Svetoslav Ganov
3e93cdd119
Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
2011-10-19 15:51:18 -07:00
Wink Saville
0c8fe99c96
Merge "Do not always say OTASP_NOT_NEEDED for LTE."
2011-10-19 15:43:38 -07:00
Adam Cohen
21ea0a3d8f
Merge "Manually merging screenshot notification string changes to master."
2011-10-19 15:31:49 -07:00
Eric Laurent
762d96fbee
am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
...
* commit '3c86134a50618605c86eb9f5f120dbf97826e3e1':
Fix issue 381905: BassBoostTest CTS tests fail...
2011-10-19 14:02:10 -07:00
Eric Laurent
fbab3f7a9c
Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
2011-10-19 13:59:55 -07:00
Scott Main
80fc292ab9
am bdca5c62: cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
...
* commit 'bdca5c6237558015910a14d38f78ba84973e8ed4':
cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
2011-10-19 12:25:12 -07:00
Scott Main
4e0e5d6e2b
am 47bc0fea: docs: fix typo in platform notes issue 5481512
...
* commit '47bc0feace5b842b3b8bf07b88e41ff658667bb3':
docs: fix typo in platform notes issue 5481512
2011-10-19 12:04:13 -07:00
Daniel Sandler
a5960ca37f
am 2f6a5327: Merge "Auto-close if you swipe away the last notification." into ics-mr0
...
* commit '2f6a53270f113a244f3b6ca91a1efef2c4a26fac':
Auto-close if you swipe away the last notification.
2011-10-19 12:00:13 -07:00
Daniel Sandler
dee884f13a
Merge "Auto-close if you swipe away the last notification." into ics-mr0
2011-10-19 11:58:27 -07:00
Dianne Hackborn
b3077a6029
am 47f8367a: Merge "Work on issue #5465917 : Wakelock *overflow* held for very long times" into ics-mr0
...
* commit '47f8367ab79247501d5d204632a7797fa8a888e5':
Work on issue #5465917 : Wakelock *overflow* held for very long times
2011-10-19 11:10:18 -07:00
Jamie Gennis
baf0e06dea
am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
...
* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
SurfaceTexture: free buffers when disconnect fails
2011-10-19 11:08:11 -07:00
Dianne Hackborn
f7db9d8b52
Merge "Work on issue #5465917 : Wakelock *overflow* held for very long times" into ics-mr0
2011-10-19 11:07:34 -07:00
Jamie Gennis
c9362e7b0f
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
2011-10-19 11:06:05 -07:00
Michael Jurka
860573e62c
am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0
...
* commit '9a76afff4da4bd51685b0938439c4f4a0e19345f':
Make Recent Apps faster
2011-10-19 10:31:47 -07:00
Ben Komalo
65da87a8bd
am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0
...
* commit '8408e5165a74ddee7d2d8698314cfda521fbfc76':
Fix remote device wipe to not hang.
2011-10-19 10:31:42 -07:00
Michael Jurka
1248d07eb9
Merge "Make Recent Apps faster" into ics-mr0
2011-10-19 10:04:19 -07:00
Ben Komalo
d5dd8263e6
Merge "Fix remote device wipe to not hang." into ics-mr0
2011-10-19 09:32:50 -07:00
Marco Nelissen
50fc325854
Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
2011-10-19 07:50:24 -07:00
The Android Open Source Project
357ae311a5
Reconcile with ics-mr0-release
...
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
2011-10-19 07:23:01 -07:00
The Android Automerger
0e66387805
merge in ics-mr0-release history after reset to ics-mr0
2011-10-19 06:28:30 -07:00
Dave Burke
818fb24357
am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
Add a LayerScreenshot
2011-10-18 23:00:08 -07:00
Dave Burke
8b29b65aeb
Merge "Add a LayerScreenshot" into ics-mr0
2011-10-18 22:58:09 -07:00
Dave Burke
6993a07d62
am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
...
* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
Fix a hang in SF caused by invalid transform matrix from the WM
2011-10-18 22:34:51 -07:00