Commit Graph

36761 Commits

Author SHA1 Message Date
Jamie Gennis
79dad8db17 Merge "EGL: update EGL_ANDROID_recordable extension." 2011-07-18 13:36:19 -07:00
Chet Haase
fe271014c7 Merge "Fixed animation ordering bug in LayoutTransition." 2011-07-18 13:07:34 -07:00
Jim Miller
58006bc166 Merge "Fix 5023708,4689527: Add popups and overlays to recents. Misc bug fixes." 2011-07-18 12:59:36 -07:00
Svetoslav Ganov
193c619dcb Merge "Touch exploration separate setting and API to poll the latter state." 2011-07-18 12:57:02 -07:00
Conley Owens
163ff035df am f139965e: (-s ours) am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:55:22 -07:00
Conley Owens
5ce26add5b am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:47:50 -07:00
Conley Owens
8c5dd0061d am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:44:57 -07:00
Conley Owens
4b1d4a7ac3 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
2011-07-18 12:42:42 -07:00
Conley Owens
9569289a8d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Dianne Hackborn
6019ba0701 Merge "Work on death recipient leaks in Activity Manager and Content Service." 2011-07-18 11:30:16 -07:00
Jean-Michel Trivi
2192697cf0 Merge "Add option to query hardware decoders only" 2011-07-18 11:07:47 -07:00
Mike Lockwood
e25c64e47a Merge "NetInitiatedActivity: support AUTO response feature for SUPL IOT" 2011-07-18 10:27:42 -07:00
Narayan Kamath
d9254f2a51 Merge "Few minor TTS clean ups." 2011-07-18 10:12:56 -07:00
Andreas Huber
461632d01a Merge "Always consider playlists corresponding to different bandwidths different." 2011-07-18 09:04:28 -07:00
Andreas Huber
4062989f52 Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started" 2011-07-18 09:04:22 -07:00
The Android Open Source Project
942b900566 Reconcile with gingerbread-release
Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
2011-07-18 08:10:06 -07:00
Narayan Kamath
c93f3d93d5 Merge "Improve TextToSpeech#isSpeaking()" 2011-07-18 02:52:35 -07:00
Mike Lockwood
69f8bf1b68 Merge "MTP: Use a single packet for the data phase" 2011-07-18 00:05:24 -07:00
Svetoslav Ganov
94d5340be5 Merge "Update the style of the action bar share UI" 2011-07-17 23:06:35 -07:00
Jamie Gennis
dc159f92fa EGL: update EGL_ANDROID_recordable extension.
This change adds an enum value and a description of the expected
implementations to the EGL_ANDROID_recordable extension specification.
It also adds the new enum value to the 'eglext.h' header.

Change-Id: Ia0de2d5613708445ff83b85a7e550f9417531ee4
2011-07-17 18:42:09 -07:00
Adam Powell
3e25ac8e45 Merge "Make View#setBackgroundDrawable a no-op if setting the same background." 2011-07-17 17:16:37 -07:00
Eric Laurent
29514934e0 Merge "Audio preprocessing wrapper for webrtc." 2011-07-17 17:12:42 -07:00
Jeff Sharkey
a14b1836c6 Merge "Data usage notifs, newly installed apps, defaults." 2011-07-17 16:29:11 -07:00
Dianne Hackborn
16adfb6082 Merge "Fix a couple static leaks." 2011-07-17 14:30:25 -07:00
Dianne Hackborn
5ef15d73c3 Merge "Rework and fix "adb shell dumpsys meminfo"" 2011-07-17 14:29:54 -07:00
Adam Powell
2c0cc7f1ca Merge "Fix bug 5037642 - Refine back button behavior for action bar modes." 2011-07-17 14:29:20 -07:00
Jeff Sharkey
f75a1d246e Merge "Acquire wakelock during network stats collection." 2011-07-17 13:06:38 -07:00
Svetoslav Ganov
d5855436d6 Merge "Throw an exception if accessibility service has not requested to retrieve window content." 2011-07-17 12:26:14 -07:00
Ken Sumrall
1664ee276f Merge "During encryption, don't throw exceptions for unknown vold state" 2011-07-17 12:21:00 -07:00
Jeff Sharkey
debb35bbea Merge "Release strong Fragment references after exec." 2011-07-17 12:06:05 -07:00
Svetoslav Ganov
4ddff39362 Merge "Exception in TouchExplorer due to invalid pointer id." 2011-07-16 13:42:11 -07:00
Jeff Brown
ffaf69119c Merge "Add support for orientationAware touch pads. Bug: 5038388" 2011-07-15 21:06:09 -07:00
Jeff Brown
b3bea6df94 Merge "Remove more edge flag cruft." 2011-07-15 21:05:36 -07:00
Fabrice Di Meglio
abab7426cf Merge "Fix bug #4972141 Overlapping content in single-choice dialogs" 2011-07-15 17:51:46 -07:00
Daniel Lehmann
917cb11822 Merge "Use higher resolution in in-call UI if available." 2011-07-15 17:41:36 -07:00
Eric Fischer
9c8b60dad3 Merge "Import revised translations." 2011-07-15 17:04:36 -07:00
Fabrice Di Meglio
df5273f893 Merge "Some code refactoring" 2011-07-15 16:52:03 -07:00
Romain Guy
d155e6cf11 Merge "Don't break the build..." 2011-07-15 16:51:30 -07:00
Romain Guy
a4d6fed95a Merge "Remove unused code" 2011-07-15 16:46:39 -07:00
Glenn Kasten
3e9f37a231 Merge "Log CPU usage" 2011-07-15 16:27:13 -07:00
Glenn Kasten
f795f549b2 Merge "CPU statistics library" 2011-07-15 16:24:26 -07:00
Rajneesh Chowdury
506c171014 Merge "Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF" 2011-07-15 16:08:01 -07:00
John Reck
875bc46d68 Merge "Implement SeekBarPreference.onGetDefaultValue" 2011-07-15 15:58:43 -07:00
Chet Haase
af5d4054bd Merge "Fix leak in LayoutTransition" 2011-07-15 15:29:30 -07:00
Chia-chi Yeh
8a75cfa5d9 Merge "VpnDialogs: change paddings." 2011-07-15 15:22:56 -07:00
Christopher Tate
d160a8b33f Merge "Support for compressed backups" 2011-07-15 15:05:53 -07:00
Irfan Sheriff
18ffebd8b7 Merge "WifiWatchdog rewrite to formal statemachine" 2011-07-15 14:38:04 -07:00
Chet Haase
9c56f8b528 Merge "Read font info from system config files" 2011-07-15 14:32:21 -07:00
Mathias Agopian
95a03bf3a1 Merge "dump GLES strings in SF dumpsys log" 2011-07-15 14:32:10 -07:00
Mathias Agopian
ad70186f80 dump GLES strings in SF dumpsys log
Change-Id: I438d511159b2bd915c84954f30574340017d4f47
2011-07-15 14:29:25 -07:00