Vasu Nori
0d4727e162
Merge "reduce locking when using SQLiteStatement"
2010-07-09 13:37:45 -07:00
Romain Guy
69719c912d
Merge "Avoid unnecessary tests when drawing ListView dividers."
2010-07-09 13:29:00 -07:00
Romain Guy
d14ca6584d
Merge "Optimize blending state changes."
2010-07-09 13:28:06 -07:00
David Brown
47d7b17f21
am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread
...
Merge commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a' into gingerbread-plus-aosp
* commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a':
Remove some (unused, non-public) phone-related status bar notification icons
2010-07-09 13:00:00 -07:00
David Brown
4865402092
Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread
2010-07-09 12:57:39 -07:00
Jean-Michel Trivi
d63e7cb721
am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
...
Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'
* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
Fix swap of sessionId and output in audio effect API.
2010-07-09 12:34:03 -07:00
Jean-Michel Trivi
29a2fa2eb0
am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
...
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp
* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
Fix swap of sessionId and output in audio effect API.
2010-07-09 12:32:21 -07:00
Jean-Michel Trivi
5b8e7a6da2
Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
2010-07-09 12:30:28 -07:00
James Dong
a1ca7c50cd
am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
...
Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'
* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
Enable the support for decoding audio with AAC+ and eAAC+ features
2010-07-09 11:43:59 -07:00
James Dong
ff1573dcc7
am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
...
Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp
* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
Enable the support for decoding audio with AAC+ and eAAC+ features
2010-07-09 11:41:08 -07:00
James Dong
e133ad9828
Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
2010-07-09 11:38:45 -07:00
Romain Guy
b1f5a929ad
Merge "Remove support for density compatibility in the hardware renderer."
2010-07-09 10:39:32 -07:00
Grace Kloba
7f8c51ef66
Merge "Combine base PictureSet with composite layers into one SkLayer tree to get ready for GL rendering."
2010-07-09 10:05:34 -07:00
Daniel Sandler
4b3ded522b
am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread
...
Merge commit '339716e03c293c1ab29492e38936643f08d797fa'
* commit '339716e03c293c1ab29492e38936643f08d797fa':
Make android:immersive public.
2010-07-09 09:20:27 -07:00
James Dong
19e2f7c8f5
am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder client
...
Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'
* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
Add runtime dumpsys support for media recorder client
2010-07-09 09:20:03 -07:00
Mike Lockwood
11ace36d8f
Merge "Remove some scafolding and test code that is no longer worth maintaining."
2010-07-09 09:01:21 -07:00
Steve Block
4205fcd815
Merge "Update Browser useragent string to reflect WebKit merge at r62496"
2010-07-09 07:35:38 -07:00
Daniel Sandler
b9a74ef132
am f99e27da: Merge "Make android:immersive public." into gingerbread
...
Merge commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc' into gingerbread-plus-aosp
* commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc':
Make android:immersive public.
2010-07-09 06:10:26 -07:00
Daniel Sandler
5ac1d3acf8
Merge "Make android:immersive public." into gingerbread
2010-07-09 06:07:51 -07:00
Maksymilian Osowski
598874e75f
Merge "A basic extension of ListActivity that allows navigating through tests and test folders."
2010-07-09 04:31:40 -07:00
James Dong
0f8bda9860
am 929642ee: Add runtime dumpsys support for media recorder client
...
Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp
* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
Add runtime dumpsys support for media recorder client
2010-07-08 21:37:43 -07:00
Romain Guy
aa2875e3ff
Merge "Draw n-patches using OpenGL."
2010-07-08 19:21:13 -07:00
Eric Laurent
ae6dfb2ca5
am b4b0f67a: am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
...
Merge commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7'
* commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7':
Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 19:10:46 -07:00
Brett Chabot
2bf778eaa7
am 243f7f85: am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread
...
Merge commit '243f7f85ea9e57716590b9cf355e55d1f0236fce'
* commit '243f7f85ea9e57716590b9cf355e55d1f0236fce':
Improve InstrumentationTestRunner exception handling.
2010-07-08 19:10:29 -07:00
Dianne Hackborn
895b3d0bdd
am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
...
Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'
* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
Add new glue code for writing native apps.
2010-07-08 19:10:17 -07:00
Jason Parks
6baa899e28
am 49ff1e6c: am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
...
Merge commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621'
* commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621':
Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
2010-07-08 19:10:10 -07:00
Scott Main
f892143e2d
am 9fd45970: am 833830e0: am 286cf139: docs: add redirect for download.html
...
Merge commit '9fd45970de75895c4b922b8ad5b8cab78f865c97'
* commit '9fd45970de75895c4b922b8ad5b8cab78f865c97':
docs: add redirect for download.html
2010-07-08 19:10:01 -07:00
Daniel Sandler
d3d2ae8090
am 4dc96b85: am f7d2b4a2: Use fullScreenIntent to show the USB mass storage dialog.
...
Merge commit '4dc96b8513ad3d3af54321716251f789769a11b4'
* commit '4dc96b8513ad3d3af54321716251f789769a11b4':
Use fullScreenIntent to show the USB mass storage dialog.
2010-07-08 19:09:42 -07:00
Xia Wang
db67cad3b3
am f3bfd841: am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread
...
Merge commit 'f3bfd841019b404f98a67fc307240031790344c9'
* commit 'f3bfd841019b404f98a67fc307240031790344c9':
Remove voice mail number verification for testing on no-sim device
2010-07-08 19:09:28 -07:00
Scott Main
1d26a279c4
am 717b517a: am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo
...
Merge commit '717b517ab319b336a406d6df0926b30a1ea84bf8'
* commit '717b517ab319b336a406d6df0926b30a1ea84bf8':
docs: add caution about adt in eclipse 3.6
2010-07-08 19:09:23 -07:00
Kenny Root
2b5c82589c
am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread
...
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'
* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
OBB API for PackageManager
2010-07-08 19:09:06 -07:00
Kenny Root
8d3ee58899
am d481cdd4: am c9535de8: Merge "Add OBB file helper class" into gingerbread
...
Merge commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370'
* commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370':
Add OBB file helper class
2010-07-08 19:08:57 -07:00
Jeff Brown
9aac262cb3
resolved conflicts for merge of 167449e5 to master
...
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
2010-07-08 19:01:13 -07:00
Adam Powell
1ff3405415
Merge "Fix some issues with smooth scrolling ListViews"
2010-07-08 18:39:42 -07:00
Jean-Baptiste Queru
e02daf9c05
Merge "update 404'd source.android.com URLs"
2010-07-08 16:25:03 -07:00
Eric Laurent
d6f55cbd78
am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
...
Merge commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2' into gingerbread-plus-aosp
* commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2':
Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 16:14:31 -07:00
Mike Lockwood
3f5ba9feb7
Merge "MTP: Use media provider database to implement MTP device support."
2010-07-08 14:29:59 -07:00
Brett Chabot
35362d4734
am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread
...
Merge commit 'f6120cf431804e072f34699a5d8a3fae62492cee' into gingerbread-plus-aosp
* commit 'f6120cf431804e072f34699a5d8a3fae62492cee':
Improve InstrumentationTestRunner exception handling.
2010-07-08 14:12:10 -07:00
Vasu Nori
213f7eaa89
Merge "reduce java locking on SQLiteDatabase if sql is already compiled"
2010-07-08 14:10:16 -07:00
Brett Chabot
0ec4ce7696
Merge "Improve InstrumentationTestRunner exception handling." into gingerbread
2010-07-08 14:09:21 -07:00
Mike Lockwood
fced0db9c4
Merge "MTP: remove separate audio table from prototype MTP database"
2010-07-08 13:09:17 -07:00
Romain Guy
68e95188ed
Merge "Do not draw the fade areas when it's not necessary."
2010-07-08 12:54:25 -07:00
Dianne Hackborn
cf9bd8d743
am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
...
Merge commit '74bf59b450daf9e7e6bf234f01db164099edbfd5' into gingerbread-plus-aosp
* commit '74bf59b450daf9e7e6bf234f01db164099edbfd5':
Add new glue code for writing native apps.
2010-07-08 12:26:32 -07:00
Dianne Hackborn
5234c75f9b
Merge "Add new glue code for writing native apps." into gingerbread
2010-07-08 12:25:20 -07:00
Jason Parks
ceef3d19a4
am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
...
Merge commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f' into gingerbread-plus-aosp
* commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f':
Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
2010-07-08 11:52:01 -07:00
Jason Parks
a0495e420c
Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
2010-07-08 11:50:40 -07:00
Romain Guy
ca214ffc56
Merge "Create FBOs in LayerCache."
2010-07-08 11:48:34 -07:00
Vasu Nori
e084eea915
Merge "STOPSHIP CL in master - make sqlite WAL default for all apps"
2010-07-08 11:43:24 -07:00
Scott Main
7b76d565d4
am 833830e0: am 286cf139: docs: add redirect for download.html
...
Merge commit '833830e0640cd25dcf3ed29ea5a9bd835caded13' into gingerbread-plus-aosp
* commit '833830e0640cd25dcf3ed29ea5a9bd835caded13':
docs: add redirect for download.html
2010-07-08 11:42:53 -07:00
Scott Main
ba6c627d06
am 286cf139: docs: add redirect for download.html
...
Merge commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62' into gingerbread
* commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62':
docs: add redirect for download.html
2010-07-08 11:40:11 -07:00