Andreas Huber
bd667dd719
Merge "Didn't mean to check this in..." into ics-mr1
2011-11-11 10:46:02 -08:00
Eric Laurent
3c1afaaf79
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
2011-11-11 08:17:22 -08:00
Andreas Huber
849c30071d
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
2011-11-11 07:39:25 -08:00
Andreas Huber
2373ecfc11
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
2011-11-11 07:39:18 -08:00
Andreas Huber
6d7a5bddb1
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
2011-11-11 07:39:11 -08:00
James Dong
714fb46074
Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
2011-11-11 01:44:06 -08:00
Svetoslav Ganov
aefd78ef93
am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
...
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
PopupWindow dismiss() can get into a recursive loop.
2011-11-11 08:02:27 +00:00
Chet Haase
131f20c4cf
am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
...
* commit '30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
DO NOT MERGE. Fix leak in LayoutTransition
2011-11-11 08:02:27 +00:00
Jamie Gennis
255d499dec
am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
2011-11-11 08:02:26 +00:00
Svetoslav Ganov
3e3f24f8e3
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
2011-11-11 00:00:02 -08:00
Jeff Sharkey
a162bb66c6
Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
2011-11-10 20:31:03 -08:00
Daniel Sandler
1e89f681d1
Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
2011-11-10 20:16:47 -08:00
Daniel Sandler
d8423837ea
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
2011-11-10 20:16:38 -08:00
Adam Powell
e50cb437f5
Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1
2011-11-10 19:56:03 -08:00
Adam Cohen
f9f56a90aa
Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1
2011-11-10 19:27:58 -08:00
John Reck
4a5f7a4de3
Merge "Fix lastVisible/global rects" into ics-mr1
2011-11-10 17:58:27 -08:00
Martijn Coenen
e87dd1ae87
Merge "Fix NdefRecord byte-stream constructor." into ics-mr1
2011-11-10 17:40:20 -08:00
Chet Haase
5fc70b4d6d
Merge "Fix leak in LayoutTransition" into ics-mr1
2011-11-10 17:33:31 -08:00
Robert Greenwalt
ed91a59dbe
Merge "Fix Wimax-less build." into ics-mr1
2011-11-10 17:22:14 -08:00
Romain Guy
c58b9999e1
Merge "Terminate EGL when an app goes in the background" into ics-mr1
2011-11-10 17:10:41 -08:00
Romain Guy
4725e2ca80
Terminate EGL when an app goes in the background
...
This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.
Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
2011-11-10 16:44:49 -08:00
Mathias Agopian
6bb9013ea2
Merge "boot animation is dithered and scaled" into ics-mr1
2011-11-10 16:38:42 -08:00
Jamie Gennis
a371380db0
Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
2011-11-10 16:06:12 -08:00
Romain Guy
97e78957ae
Merge "Initialize egl_cache with an app writeable file" into ics-mr1
2011-11-10 15:02:07 -08:00
Jeff Brown
6d751cea72
Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
2011-11-10 14:40:48 -08:00
Peter Ng
53de2e881a
Merge "lock pattern width spec set to max" into ics-mr1
2011-11-10 14:31:09 -08:00
Peter Ng
531fc2b4b3
Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
2011-11-10 14:26:57 -08:00
Katie McCormick
19ddec5461
am 921afe39: Doc change: new Calendar content provider doc
...
* commit '921afe39d6041b06c6a002b08f9dcd1561a9ae99':
Doc change: new Calendar content provider doc
2011-11-10 22:20:37 +00:00
Adam Powell
42fc2736d2
Merge "Fix access modifiers on ImageView overrides" into ics-mr1
2011-11-10 14:16:45 -08:00
Dianne Hackborn
0df52ee122
Merge "Fix issue #5470311 : Activity with android:configChanges defined..." into ics-mr1
2011-11-10 14:12:25 -08:00
Adam Powell
8fe37bdd55
Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ics-mr1
2011-11-10 13:57:24 -08:00
Martijn Coenen
73811644be
Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1
2011-11-10 13:48:02 -08:00
Chet Haase
0a55276715
Merge "increase the rate at which we dispatch events." into ics-mr1
2011-11-10 13:44:34 -08:00
Kenny Root
bc27c00e07
Merge "Close file on exception as well" into ics-mr1
2011-11-10 13:18:24 -08:00
Tom Taylor
7b3e285fc3
Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
2011-11-10 13:11:16 -08:00
Eino-Ville Talvala
583486f5db
Merge "Add a sound-playing method to Camera API." into ics-mr1
2011-11-10 12:07:05 -08:00
Mathias Agopian
55adfca3a2
Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1
2011-11-10 10:33:55 -08:00
John Reck
7b9d0dcc13
Merge "Pause drawing when not visible" into ics-mr1
2011-11-10 09:19:55 -08:00
Andreas Huber
51b0522efd
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
2011-11-10 08:48:44 -08:00
Andreas Huber
9e2f3ff522
Merge "Don't believe the PV decoder's lies..." into ics-mr1
2011-11-10 08:48:34 -08:00
Andreas Huber
5b119b4020
Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
2011-11-10 08:47:25 -08:00
George Mount
58365bf2d8
Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1
2011-11-10 08:32:18 -08:00
Eric Laurent
a6679903c2
Merge "Fix problems in tablet silent mode." into ics-mr1
2011-11-10 08:28:58 -08:00
Wink Saville
b057de6cbf
am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
...
* commit 'e562287c85662457864255028cd4bc3b04f13750':
[maguro] Update COMPREHENSION-TLV parser in CAT
2011-11-10 15:22:35 +00: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
Gilles Debunne
29c5ea8fc0
Merge "Visual glitches when starting extracted text" into ics-mr1
2011-11-10 00:48:10 -08:00
Dave Burke
eeb561cc70
am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
...
* commit 'b96194308dc8678e99564f038872061e4881e65a':
Actually 59 fps DO NOT MERGE
2011-11-10 07:59:32 +00: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
