ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
36,993 Commits 2 Branches 0 Tags 54 MiB
ab7c13f96a
Commit Graph

36993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deckard Autoverifier
8ac35d9886 am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:46:26 -07:00
Deckard Autoverifier
58a01d9465 am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'b32af642454f3113cb1539821eb3b0dbf4174974':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:46:21 -07:00
Deckard Autoverifier
0ccd5a4b14 am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:46:18 -07:00
Deckard Autoverifier
a7f805c612 am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:46:14 -07:00
Deckard Autoverifier
c2c84e91b2 am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:44:03 -07:00
Deckard Autoverifier
fb8bca5cda am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '31140598866c668047fc6dede7944e146aa21a0a':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:44:01 -07:00
Deckard Autoverifier
6ec08140b2 am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:43:58 -07:00
Deckard Autoverifier
2139600b7e am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:43:54 -07:00
Deckard Autoverifier
4161a0125e am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '89bac1820f3788d655ae293ec9a65c18226e09ee':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:41:31 -07:00
Deckard Autoverifier
190218df66 am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '16db83c26442f5e25b6aad77a37b612fa0be9862':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:41:29 -07:00
Deckard Autoverifier
9781293261 am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '80ef1745d00c235b117e389e56e58210cf88e5c8':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:41:26 -07:00
Deckard Autoverifier
1a2e048221 am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '68e37dacc065eebb971d443722b7a8413ff403d6':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:41:24 -07:00
Deckard Autoverifier
07f2ce413a am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:38:30 -07:00
Deckard Autoverifier
b54c227775 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:38:27 -07:00
Deckard Autoverifier
2be5cc29df am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:38:25 -07:00
Deckard Autoverifier
c4bb45511c am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:38:22 -07:00
Deckard Autoverifier
fde808cbb3 Merge "stagefright: Include stdlib.h for malloc/free" 2011-07-18 15:23:41 -07:00
Deckard Autoverifier
e51e21c863 Merge "stagefright amrwbenc: Remove a duplicate, unused file" 2011-07-18 15:23:31 -07:00
Deckard Autoverifier
1ae41e21dc Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 2011-07-18 15:23:20 -07:00
Deckard Autoverifier
605aac1879 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 2011-07-18 15:23:09 -07:00
Jamie Gennis
bfeec23b62 Merge "CameraService: (dis)connect from preview windows" 2011-07-18 15:19:20 -07:00
Jamie Gennis
a086dcafc2 Merge "MediaPlayer: add ANativeWindow (dis)connect calls" 2011-07-18 15:18:43 -07:00
Philip Milne
40a7395772 Merge "Derive GridLayout's 'gap' constants from new "default_gap" entry in dimens.xml." 2011-07-18 15:17:06 -07:00
Jamie Gennis
a2f3b90d98 Merge "SurfaceTexture: add a multi-SurfaceTexture test" 2011-07-18 15:00:54 -07:00
Mathias Agopian
6d3ccc88ee Merge "move lock/unlock implementaion outside of Surface into SurfaceTextureClient" 2011-07-18 14:55:58 -07:00
Chet Haase
56ef6321a8 Merge "Fix leftover artifacts from sliding Recents items out" 2011-07-18 14:40:54 -07:00
Jesse Wilson
253882e614 Merge "Track line and column when parsing JSON." 2011-07-18 14:39:39 -07:00
Jesse Wilson
34d837e836 Merge "Always escape chars that JavaScript treats as newlines." 2011-07-18 14:27:31 -07:00
Fabrice Di Meglio
1d88cd2947 Merge "Fix resolution padding glitch" 2011-07-18 14:26:45 -07:00
Fabrice Di Meglio
e664eb289e Merge "Clean test APIs for Harfbuzz support" 2011-07-18 14:26:34 -07:00
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