satok
|
d0f53ad7de
|
Merge "Hide "Configure input method" button when the screen is locked."
|
2011-07-18 20:43:24 -07:00 |
|
satok
|
108ed56563
|
Merge "Enable IMEs to set additional subtypes in background"
|
2011-07-18 20:42:54 -07:00 |
|
Jeff Brown
|
cc11feae58
|
Merge "Fix drag and drop regression. Bug: 5032496"
|
2011-07-18 20:08:48 -07:00 |
|
Jeff Brown
|
404dd20610
|
Merge "Remove an unnecessary finalizer."
|
2011-07-18 19:47:10 -07:00 |
|
Bart Sears
|
fadc294088
|
Merge "Revert "Add in i18n TLDs and new TLDs to the URL RegEx matcher.""
|
2011-07-18 19:45:33 -07:00 |
|
Adam Powell
|
525dcdbf8f
|
Merge "Fix bug 5031652 - offer a way to associate metadata with an ActionMode"
|
2011-07-18 19:40:17 -07:00 |
|
Todor Kalaydjiev
|
e855608228
|
Merge "Manually bring change Ie8fb8162 to master ("Add images to ERI icon list"). Fixes b/4604593."
|
2011-07-18 18:45:36 -07:00 |
|
Wink Saville
|
ec77b49f8c
|
am 6e8c7dd2: am cd4636ec: Add LteOnCdmaDevice system property.
* commit '6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5':
Add LteOnCdmaDevice system property.
|
2011-07-18 18:42:41 -07:00 |
|
Wink Saville
|
e5b9400b84
|
am cd4636ec: Add LteOnCdmaDevice system property.
* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
Add LteOnCdmaDevice system property.
|
2011-07-18 18:39:41 -07:00 |
|
Shimeng (Simon) Wang
|
bd0609212c
|
Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher."
|
2011-07-18 18:04:51 -07:00 |
|
Romain Guy
|
d2f8b47f1b
|
Merge "Update TextureView.lockCanvas() test."
|
2011-07-18 17:51:59 -07:00 |
|
Fabrice Di Meglio
|
511059946c
|
Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing"
|
2011-07-18 17:43:11 -07:00 |
|
Doug Kwan
|
aa52ebb8b9
|
Merge "Add C code to use BDADDR_ANY macro properly. The macro expands into code that is not valid C++. So we need to use a C helper."
|
2011-07-18 17:02:55 -07:00 |
|
Conley Owens
|
4dac1c4e10
|
am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d':
stagefright aacenc: Mark codeWord as UWord16
|
2011-07-18 16:57:04 -07:00 |
|
Conley Owens
|
83937f38f0
|
am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
stagefright aacenc: Mark codeWord as UWord16
|
2011-07-18 16:55:33 -07:00 |
|
Conley Owens
|
60f8195edc
|
am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
stagefright aacenc: Mark codeWord as UWord16
|
2011-07-18 16:53:41 -07:00 |
|
Conley Owens
|
61d3cf3bfa
|
am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
stagefright aacenc: Mark codeWord as UWord16
|
2011-07-18 16:52:26 -07:00 |
|
Conley Owens
|
0d0cbd3d03
|
Merge "stagefright aacenc: Mark codeWord as UWord16"
|
2011-07-18 16:49:43 -07:00 |
|
Adam Powell
|
6776d1911d
|
Merge "Make the theme attribute actionModeStyle public."
|
2011-07-18 16:29:53 -07:00 |
|
Romain Guy
|
e7aa305f50
|
Merge "Trim OpenGLRenderer's memory usage whenever possible"
|
2011-07-18 16:06:31 -07:00 |
|
Dianne Hackborn
|
58e16f46b2
|
Merge "Fix issue # 5017868: Twitter crashes on start:"
|
2011-07-18 16:03:08 -07:00 |
|
Mike Lockwood
|
a96fcc9c51
|
Merge "UsbManager: document that passing null setCurrentFunction restores default function"
|
2011-07-18 15:59:35 -07:00 |
|
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 |
|