Mathias Agopian
3843ed9e1f
am 5126633a: am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
...
Merge commit '5126633a3e7d04754792e0702231b1b6be2d1498'
* commit '5126633a3e7d04754792e0702231b1b6be2d1498':
Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:03:33 -07:00
Mathias Agopian
3cff2cd950
am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
...
Merge commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp
* commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c':
Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:00:40 -07:00
Shih-wei Liao
cd76a6368d
Merge "Comment out rsqrt for now. Long-term: Need to figur out why rsqrt caused slang to abort."
2010-06-14 21:16:26 -07:00
Mike Lockwood
2891354410
Merge "MTP device: Read manufacturer name and serial number from system properties."
2010-06-14 18:01:01 -07:00
Vasu Nori
031cf97703
Merge "fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591"
2010-06-14 17:11:20 -07:00
Jeff Brown
6f19e9c1c2
am e0e5da0d: am 96e59eb8: Merge "Support for multiple tests" into gingerbread
...
Merge commit 'e0e5da0d648f4167e2a12ea02f4794f81a057da7'
* commit 'e0e5da0d648f4167e2a12ea02f4794f81a057da7':
Support for multiple tests
2010-06-14 17:06:56 -07:00
Jeff Brown
cb920b9923
am 96e59eb8: Merge "Support for multiple tests" into gingerbread
...
Merge commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp
* commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
Support for multiple tests
2010-06-14 16:32:28 -07:00
Jean-Baptiste Queru
4b2005c9fb
Merge "Replaced deprecated String Constructor"
2010-06-14 16:23:58 -07:00
Jeff Brown
f1be483e8e
Merge "Support for multiple tests" into gingerbread
2010-06-14 15:49:57 -07:00
Jeff Brown
f69280ef72
Support for multiple tests
...
The build system enforces some invariants that were being ignored
before.
Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
2010-06-14 15:46:08 -07:00
Brad Fitzpatrick
128e154a4d
am 92dd85d0: am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
...
Merge commit '92dd85d02af60b001f1ae6919eeb11bcf38e64c8'
* commit '92dd85d02af60b001f1ae6919eeb11bcf38e64c8':
StrictMode: implement the log-to-DropBox option
2010-06-14 15:25:09 -07:00
Brad Fitzpatrick
4e1226a896
am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
...
Merge commit '742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp
* commit '742b282e1168ed3820cb549a89753f39f4de0fa6':
StrictMode: implement the log-to-DropBox option
2010-06-14 15:21:21 -07:00
Brad Fitzpatrick
c5bfe40ff6
Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
2010-06-14 15:19:51 -07:00
Fabrice Di Meglio
d5c266d9da
Merge "Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)"
2010-06-14 15:10:19 -07:00
Dianne Hackborn
8d3ed80ba9
am 13792057: am 7e900cbf: Merge "Update build version information." into gingerbread
...
Merge commit '13792057e4fef30c9b6fe2b8249b246841508164'
* commit '13792057e4fef30c9b6fe2b8249b246841508164':
Update build version information.
2010-06-14 14:44:17 -07:00
James Dong
6b7d73eb48
am 814f430c: am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
...
Merge commit '814f430cb5e313316600fd6694ed338edd5fff7d'
* commit '814f430cb5e313316600fd6694ed338edd5fff7d':
Fixed a typo - maybe we should do comparison ignoring the case?
2010-06-14 14:43:57 -07:00
The Android Open Source Project
9bc88eed9d
merge from open-source master
...
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
2010-06-14 14:28:18 -07:00
The Android Open Source Project
1a4ab4aa0e
merge from open-source master
...
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
2010-06-14 14:18:32 -07:00
Dianne Hackborn
21023705d4
am 7e900cbf: Merge "Update build version information." into gingerbread
...
Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp
* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
Update build version information.
2010-06-14 14:13:07 -07:00
Dianne Hackborn
7bf6a50b19
Merge "Update build version information." into gingerbread
2010-06-14 14:10:43 -07:00
Jean-Baptiste Queru
e3b45a8eff
Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL."
2010-06-14 13:54:25 -07:00
Shih-wei Liao
a6cdd0d0b0
Merge "To enable the reflection of rs_mesh etc. Side benefit: Better type checking. Double-checked with Nick that the extra "struct" is enabling reflection and type checking without incurring overhead."
2010-06-14 13:39:33 -07:00
James Dong
7a287e8929
am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
...
Merge commit 'dca66e1c3bc8842b0d44e0cb004e507a456e4b8f' into gingerbread-plus-aosp
* commit 'dca66e1c3bc8842b0d44e0cb004e507a456e4b8f':
Fixed a typo - maybe we should do comparison ignoring the case?
2010-06-14 13:20:54 -07:00
Jean-Baptiste Queru
8216ca8aa0
Merge "Corrected SPN and PLMN name handling"
2010-06-14 12:47:49 -07:00
The Android Open Source Project
bb08fc1619
am 864c68ea: merge from froyo-plus-aosp
...
Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'
* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
Added an addAll to the ArrayAdapter
WLAN: Reset power save mode to startup value after DHCP response.
Add PageUp and PageDown hot keys
Should accept "application/vnd.wap.multipart.alternative" message.
replaced deprecated getIntent with parseURI
2010-06-14 11:39:26 -07:00
The Android Open Source Project
aed0cae055
merge from froyo-plus-aosp
...
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
2010-06-14 11:35:51 -07:00
The Android Open Source Project
5c4c784bd7
merge from open-source master
...
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
2010-06-14 11:07:32 -07:00
The Android Open Source Project
f7ac9f5f68
merge from open-source master
...
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
2010-06-14 11:06:33 -07:00
The Android Open Source Project
07ba8effde
merge from open-source master
...
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
2010-06-14 11:02:30 -07:00
The Android Open Source Project
16f60b78d4
merge from open-source master
...
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
2010-06-14 10:57:53 -07:00
Jean-Baptiste Queru
9cff675dcd
Merge "replaced deprecated getIntent with parseURI"
2010-06-14 10:28:23 -07:00
Brad Fitzpatrick
ec98ac7ec1
am 6b9b8806: am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
...
Merge commit '6b9b8806afb06e393203450bda8a53af08952590'
* commit '6b9b8806afb06e393203450bda8a53af08952590':
Dropbox: remove redundant Entry construction.
2010-06-14 09:36:12 -07:00
Brad Fitzpatrick
9da3110960
am 60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
...
Merge commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp
* commit '60e8c33d6f6caad2e963e91abca16a85cd3be82a':
Dropbox: remove redundant Entry construction.
2010-06-14 09:34:22 -07:00
Steve Block
db4ad76f8b
Merge "Add the basic outline of the web runtime used to display installed web applications"
2010-06-14 09:32:38 -07:00
Brad Fitzpatrick
4607338eaf
Merge "Dropbox: remove redundant Entry construction." into gingerbread
2010-06-14 09:32:26 -07:00
Jean-Baptiste Queru
ac3e5138d6
Merge "Added an addAll to the ArrayAdapter"
2010-06-14 09:27:14 -07:00
Eric Laurent
33b967f2d8
am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
...
Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'
* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:10:32 -07:00
Eric Laurent
3924c2f113
am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
...
Merge commit 'e0219539c6c3e60de4a35cd836df3b68c963e9e0' into gingerbread-plus-aosp
* commit 'e0219539c6c3e60de4a35cd836df3b68c963e9e0':
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:07:03 -07:00
Eric Laurent
6538b8a1c4
am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
...
Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread
* commit '01f7ac64488027492b2909b99d70491e7a391015':
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
2010-06-14 09:04:33 -07:00
Eric Laurent
886f496c55
Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
2010-06-14 09:02:13 -07:00
Jean-Baptiste Queru
511be955d9
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
2010-06-14 08:56:49 -07:00
Chih-Chung Chang
5d81cbc081
am da755ad3: am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.
...
Merge commit 'da755ad331aa77fb3780b84c384a27d0217bf410'
* commit 'da755ad331aa77fb3780b84c384a27d0217bf410':
Correct the setDisplayOrientation sample code.
2010-06-14 04:17:59 -07:00
Chih-Chung Chang
328f8ba9a5
am f1cefa91: am 724c5224: Correct the setDisplayOrientation sample code.
...
Merge commit 'f1cefa916712dafc8b47f6eb8132a688892d4995' into gingerbread-plus-aosp
* commit 'f1cefa916712dafc8b47f6eb8132a688892d4995':
Correct the setDisplayOrientation sample code.
2010-06-14 04:14:09 -07:00
Chih-Chung Chang
11b46095ca
am 724c5224: Correct the setDisplayOrientation sample code.
...
Merge commit '724c52244423feced2677fbd1f905e0b8b0639f2' into gingerbread
* commit '724c52244423feced2677fbd1f905e0b8b0639f2':
Correct the setDisplayOrientation sample code.
2010-06-14 04:11:00 -07:00
Jeff Brown
157a2647fc
am 4166aec5: am 28a6c8e9: am d890cbf7: Remove PollLoop from host build.
...
Merge commit '4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b'
* commit '4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b':
Remove PollLoop from host build.
2010-06-13 20:28:29 -07:00
Jeff Brown
523bc789ea
am 28a6c8e9: am d890cbf7: Remove PollLoop from host build.
...
Merge commit '28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8' into gingerbread-plus-aosp
* commit '28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8':
Remove PollLoop from host build.
2010-06-13 20:26:54 -07:00
Jeff Brown
852f0a7573
am d890cbf7: Remove PollLoop from host build.
...
Merge commit 'd890cbf700695c869e6b45cddf7f132484697588' into gingerbread
* commit 'd890cbf700695c869e6b45cddf7f132484697588':
Remove PollLoop from host build.
2010-06-13 20:25:29 -07:00
Jeff Brown
beb2359b9b
Remove PollLoop from host build.
...
We can't build (and we don't need) PollLoop in the SDK on all platforms.
Change-Id: I3b0f327bbb8bc58b9b8630b0161cf360403fea68
2010-06-13 20:21:19 -07:00
Jeff Brown
4215f50740
am 34b418cd: am 5e95930b: am 43a9527c: Fix include paths.
...
Merge commit '34b418cddbd2f05d5c0a98c550c65e457015134e'
* commit '34b418cddbd2f05d5c0a98c550c65e457015134e':
Fix include paths.
2010-06-13 20:03:20 -07:00
Jeff Brown
6d7088e515
am 5e95930b: am 43a9527c: Fix include paths.
...
Merge commit '5e95930bd87b98b01ffe48075fa13c234c2ed08f' into gingerbread-plus-aosp
* commit '5e95930bd87b98b01ffe48075fa13c234c2ed08f':
Fix include paths.
2010-06-13 20:01:47 -07:00