OSDN Git Service
James Dong [Thu, 17 Jun 2010 18:28:28 +0000 (11:28 -0700)]
am
d8402d78: am
cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit '
d8402d7861ed81e90dd0a03b9a630e66551cc783'
* commit '
d8402d7861ed81e90dd0a03b9a630e66551cc783':
Remove hard-coded number of audio channels in AudioSource
James Dong [Thu, 17 Jun 2010 18:26:57 +0000 (11:26 -0700)]
am
cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit '
cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp
* commit '
cd677a30851e4ba8b79a41c20e20220a81719378':
Remove hard-coded number of audio channels in AudioSource
James Dong [Thu, 17 Jun 2010 18:25:19 +0000 (11:25 -0700)]
Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Gilles Debunne [Thu, 17 Jun 2010 17:05:29 +0000 (10:05 -0700)]
Merge "Removed warnings in LayoutInflater."
Gilles Debunne [Thu, 17 Jun 2010 17:05:11 +0000 (10:05 -0700)]
Merge "Index out of range problem in TextLine."
Dianne Hackborn [Thu, 17 Jun 2010 02:55:12 +0000 (19:55 -0700)]
am
9a1034aa: am
6b7b4845: Various improvements to battery stats collection
Merge commit '
9a1034aa9746b94ecb659ea849765a160bdf747e'
* commit '
9a1034aa9746b94ecb659ea849765a160bdf747e':
Various improvements to battery stats collection
Dianne Hackborn [Thu, 17 Jun 2010 01:49:28 +0000 (18:49 -0700)]
am
6b7b4845: Various improvements to battery stats collection
Merge commit '
6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp
* commit '
6b7b4845212b3a439c527f2e1eca205b6b45fceb':
Various improvements to battery stats collection
Fabrice Di Meglio [Thu, 17 Jun 2010 00:01:48 +0000 (17:01 -0700)]
Merge "Fix bug #
2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)"
Gilles Debunne [Wed, 16 Jun 2010 23:29:53 +0000 (16:29 -0700)]
Merge "Suppressed warnings in TextView."
Dmitri Plotnikov [Wed, 16 Jun 2010 23:15:08 +0000 (16:15 -0700)]
Merge "Preventing cursor leaks when a query is interrupted"
Fabrice Di Meglio [Wed, 16 Jun 2010 22:35:31 +0000 (15:35 -0700)]
Merge "Fix bug#
2772317 (CalendarDatabaseHelper internal cleanup)"
Brett Chabot [Wed, 16 Jun 2010 21:42:51 +0000 (14:42 -0700)]
am
685fcf36: am
c95812e6: Merge "Move out all framework-tests classes." into gingerbread
Merge commit '
685fcf364b84d5ac911ae9cbbc4fec99f36cbd48'
* commit '
685fcf364b84d5ac911ae9cbbc4fec99f36cbd48':
Move out all framework-tests classes.
Brett Chabot [Wed, 16 Jun 2010 21:41:00 +0000 (14:41 -0700)]
am
c95812e6: Merge "Move out all framework-tests classes." into gingerbread
Merge commit '
c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit '
c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.
Brett Chabot [Wed, 16 Jun 2010 21:39:41 +0000 (14:39 -0700)]
Merge "Move out all framework-tests classes." into gingerbread
Irfan Sheriff [Wed, 16 Jun 2010 21:35:51 +0000 (14:35 -0700)]
Irfan Sheriff [Wed, 16 Jun 2010 21:31:54 +0000 (14:31 -0700)]
am
f897b443: Fix driver stop check
Merge commit '
f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp
* commit '
f897b443fed5c88c6b12e3fa1da72f231db67673':
Fix driver stop check
Mason Tang [Wed, 16 Jun 2010 20:59:42 +0000 (13:59 -0700)]
Merge "Modified first animation and visibility change behavior for ViewFlipper"
Vasu Nori [Wed, 16 Jun 2010 19:30:48 +0000 (12:30 -0700)]
Merge "throw correct exception"
Patrick Scott [Wed, 16 Jun 2010 18:58:13 +0000 (11:58 -0700)]
Merge "Move WebViewDatabase initialization into a background thread."
Robert Greenwalt [Wed, 16 Jun 2010 18:07:59 +0000 (11:07 -0700)]
Merge "Move the net transition wakelock to ConnService."
Adam Powell [Wed, 16 Jun 2010 17:52:50 +0000 (10:52 -0700)]
Scott Main [Wed, 16 Jun 2010 02:48:12 +0000 (19:48 -0700)]
am
a0210f76: am
c980ba25: am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
a0210f76e451a0fede557e704832f605034584c4'
* commit '
a0210f76e451a0fede557e704832f605034584c4':
docs: update dashboard
Scott Main [Wed, 16 Jun 2010 02:45:00 +0000 (19:45 -0700)]
am
c980ba25: am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
c980ba25b0916d7c276c23e420195dd7959379a0' into gingerbread-plus-aosp
* commit '
c980ba25b0916d7c276c23e420195dd7959379a0':
docs: update dashboard
Scott Main [Wed, 16 Jun 2010 02:39:32 +0000 (19:39 -0700)]
am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread
* commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8':
docs: update dashboard
Scott Main [Wed, 16 Jun 2010 02:33:03 +0000 (19:33 -0700)]
Merge "docs: update dashboard" into froyo
Romain Guy [Wed, 16 Jun 2010 01:06:47 +0000 (18:06 -0700)]
Merge "Add new API to check whether a Bitmap was modified."
Jason Sams [Wed, 16 Jun 2010 00:12:51 +0000 (17:12 -0700)]
Merge "Remove InvokeData and add ContextFinish to generate a sync point."
Jeff Brown [Tue, 15 Jun 2010 23:50:12 +0000 (16:50 -0700)]
am
2dfd2aa4: am
92266a78: Merge "More work in progress on native events." into gingerbread
Merge commit '
2dfd2aa413a91965c1a247980598c795db9b4c38'
* commit '
2dfd2aa413a91965c1a247980598c795db9b4c38':
More work in progress on native events.
Jeff Brown [Tue, 15 Jun 2010 23:48:23 +0000 (16:48 -0700)]
am
92266a78: Merge "More work in progress on native events." into gingerbread
Merge commit '
92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp
* commit '
92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
Jeff Brown [Tue, 15 Jun 2010 23:44:23 +0000 (16:44 -0700)]
Merge "More work in progress on native events." into gingerbread
Jeff Brown [Tue, 15 Jun 2010 08:31:58 +0000 (01:31 -0700)]
More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
Wei Huang [Tue, 15 Jun 2010 23:01:32 +0000 (16:01 -0700)]
am
5907ffa4: am
a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit '
5907ffa453cf92f2f0de760354e4013df4ea6b69'
* commit '
5907ffa453cf92f2f0de760354e4013df4ea6b69':
add new video/audio presence icons in the framework resource dirs, and make them public.
Ying Wang [Tue, 15 Jun 2010 22:58:28 +0000 (15:58 -0700)]
resolved conflicts for merge of
2f6f6240 to master
Change-Id: Ia91944b5c28a04b6b3f968305266a39a376a0e85
Joe Onorato [Tue, 15 Jun 2010 22:49:11 +0000 (15:49 -0700)]
am
c43f4784: am
987e223d: am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
c43f4784253f49189f20d131508bdb23da113197'
* commit '
c43f4784253f49189f20d131508bdb23da113197':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 22:49:05 +0000 (15:49 -0700)]
am
3d6ea3bd: am
9a5fcd1c: am
9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '
3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'
* commit '
3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Wei Huang [Tue, 15 Jun 2010 22:36:41 +0000 (15:36 -0700)]
am
a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit '
a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp
* commit '
a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
add new video/audio presence icons in the framework resource dirs, and make them public.
Ying Wang [Tue, 15 Jun 2010 22:34:51 +0000 (15:34 -0700)]
am
3137f8c5: am
6567adf8: Move android-common to framework/ex
Merge commit '
3137f8c54d00d8eefe011a0256e2d85a036b207c' into gingerbread-plus-aosp
* commit '
3137f8c54d00d8eefe011a0256e2d85a036b207c':
Move android-common to framework/ex
Wei Huang [Tue, 15 Jun 2010 22:34:06 +0000 (15:34 -0700)]
Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Ying Wang [Tue, 15 Jun 2010 22:32:10 +0000 (15:32 -0700)]
am
6567adf8: Move android-common to framework/ex
Merge commit '
6567adf8b637c36817625cd38d64cd4b8510b097' into gingerbread
* commit '
6567adf8b637c36817625cd38d64cd4b8510b097':
Move android-common to framework/ex
Ying Wang [Tue, 15 Jun 2010 20:45:08 +0000 (13:45 -0700)]
Move android-common to framework/ex
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
Joe Onorato [Tue, 15 Jun 2010 22:23:59 +0000 (15:23 -0700)]
am
987e223d: am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp
* commit '
987e223df73abe6cca47d09fff3a87be0243a085':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 22:23:55 +0000 (15:23 -0700)]
am
9a5fcd1c: am
9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '
9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp
* commit '
9a5fcd1c14dcea951099433885ed3519dee90f48':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Joe Onorato [Tue, 15 Jun 2010 22:21:21 +0000 (15:21 -0700)]
am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread
* commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 22:21:14 +0000 (15:21 -0700)]
am
9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread
* commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Jason Sams [Tue, 15 Jun 2010 21:55:02 +0000 (14:55 -0700)]
Merge "update image processing."
Joe Onorato [Tue, 15 Jun 2010 20:59:10 +0000 (13:59 -0700)]
Merge "Use the droidcore goal with dist-for-goals." into froyo
Joe Onorato [Tue, 15 Jun 2010 20:58:33 +0000 (13:58 -0700)]
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
James Dong [Tue, 15 Jun 2010 18:20:23 +0000 (11:20 -0700)]
am
56b64c75: am
ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Merge commit '
56b64c75c3809c55c2053f77802344a9e035343f'
* commit '
56b64c75c3809c55c2053f77802344a9e035343f':
This patch enables each omx instance to have a separate message dispatcher, and
James Dong [Tue, 15 Jun 2010 17:50:43 +0000 (10:50 -0700)]
am
ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Merge commit '
ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp
* commit '
ac8b0d47011293ef713f4996317bbda579354200':
This patch enables each omx instance to have a separate message dispatcher, and
Scott Main [Tue, 15 Jun 2010 17:50:34 +0000 (10:50 -0700)]
am
522d9907: am
0014296b: am
457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '
522d990741b74b4d79f9675da7f32c482253407b'
* commit '
522d990741b74b4d79f9675da7f32c482253407b':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:50:30 +0000 (10:50 -0700)]
am
fb48f3a2: am
e4bca7ee: am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
fb48f3a25d821a9037591aa76faa7bae46d1debd'
* commit '
fb48f3a25d821a9037591aa76faa7bae46d1debd':
docs: fix markup error
James Dong [Tue, 15 Jun 2010 17:48:58 +0000 (10:48 -0700)]
Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Scott Main [Tue, 15 Jun 2010 17:47:24 +0000 (10:47 -0700)]
am
0014296b: am
457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '
0014296b1faca612134a1daa7f74dd82ed40cc2d' into gingerbread-plus-aosp
* commit '
0014296b1faca612134a1daa7f74dd82ed40cc2d':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:47:21 +0000 (10:47 -0700)]
am
e4bca7ee: am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp
* commit '
e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
docs: fix markup error
Scott Main [Tue, 15 Jun 2010 17:43:10 +0000 (10:43 -0700)]
am
457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '
457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread
* commit '
457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:42:52 +0000 (10:42 -0700)]
am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread
* commit '
322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
Scott Main [Tue, 15 Jun 2010 17:36:27 +0000 (10:36 -0700)]
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Scott Main [Tue, 15 Jun 2010 17:36:14 +0000 (10:36 -0700)]
Merge "docs: fix markup error" into froyo
Mike Lockwood [Tue, 15 Jun 2010 15:57:21 +0000 (08:57 -0700)]
Merge "MTP: Use stat.st_mode instead of dirent.d_type to determine file type."
Mike Lockwood [Tue, 15 Jun 2010 15:57:13 +0000 (08:57 -0700)]
Merge "MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN"
Mathias Agopian [Tue, 15 Jun 2010 05:03:33 +0000 (22:03 -0700)]
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.
Mathias Agopian [Tue, 15 Jun 2010 05:00:40 +0000 (22:00 -0700)]
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.
Shih-wei Liao [Tue, 15 Jun 2010 04:16:26 +0000 (21:16 -0700)]
Merge "Comment out rsqrt for now. Long-term: Need to figur out why rsqrt caused slang to abort."
Mike Lockwood [Tue, 15 Jun 2010 01:01:01 +0000 (18:01 -0700)]
Merge "MTP device: Read manufacturer name and serial number from system properties."
Vasu Nori [Tue, 15 Jun 2010 00:11:20 +0000 (17:11 -0700)]
Merge "fix bugs introduced by I3ef1bcdb2eb1c45f68e829ccb6e3ecde28076591"
Jeff Brown [Tue, 15 Jun 2010 00:06:56 +0000 (17:06 -0700)]
am
e0e5da0d: am
96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit '
e0e5da0d648f4167e2a12ea02f4794f81a057da7'
* commit '
e0e5da0d648f4167e2a12ea02f4794f81a057da7':
Support for multiple tests
Jeff Brown [Mon, 14 Jun 2010 23:32:28 +0000 (16:32 -0700)]
am
96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit '
96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp
* commit '
96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
Support for multiple tests
Jeff Brown [Mon, 14 Jun 2010 22:49:57 +0000 (15:49 -0700)]
Merge "Support for multiple tests" into gingerbread
Jeff Brown [Mon, 14 Jun 2010 22:44:41 +0000 (15:44 -0700)]
Support for multiple tests
The build system enforces some invariants that were being ignored
before.
Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
Brad Fitzpatrick [Mon, 14 Jun 2010 22:25:09 +0000 (15:25 -0700)]
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
Brad Fitzpatrick [Mon, 14 Jun 2010 22:21:21 +0000 (15:21 -0700)]
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
Brad Fitzpatrick [Mon, 14 Jun 2010 22:19:51 +0000 (15:19 -0700)]
Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Fabrice Di Meglio [Mon, 14 Jun 2010 22:10:19 +0000 (15:10 -0700)]
Merge "Fix bug #
1661857 (switch from using meta feed to the new allcalendars feed)"
Dianne Hackborn [Mon, 14 Jun 2010 21:44:17 +0000 (14:44 -0700)]
am
13792057: am
7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '
13792057e4fef30c9b6fe2b8249b246841508164'
* commit '
13792057e4fef30c9b6fe2b8249b246841508164':
Update build version information.
James Dong [Mon, 14 Jun 2010 21:43:57 +0000 (14:43 -0700)]
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?
Dianne Hackborn [Mon, 14 Jun 2010 21:13:07 +0000 (14:13 -0700)]
am
7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '
7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp
* commit '
7e900cbf1d600a8895e63a0247f45c116ff05172':
Update build version information.
Dianne Hackborn [Mon, 14 Jun 2010 21:10:43 +0000 (14:10 -0700)]
Merge "Update build version information." into gingerbread
Shih-wei Liao [Mon, 14 Jun 2010 20:39:33 +0000 (13:39 -0700)]
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."
James Dong [Mon, 14 Jun 2010 20:20:54 +0000 (13:20 -0700)]
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?
The Android Open Source Project [Mon, 14 Jun 2010 18:39:26 +0000 (11:39 -0700)]
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
The Android Open Source Project [Mon, 14 Jun 2010 18:35:51 +0000 (11:35 -0700)]
merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
The Android Open Source Project [Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
The Android Open Source Project [Mon, 14 Jun 2010 18:06:33 +0000 (11:06 -0700)]
merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
The Android Open Source Project [Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)]
merge from open-source master
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
The Android Open Source Project [Mon, 14 Jun 2010 17:57:53 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
Jean-Baptiste Queru [Mon, 14 Jun 2010 17:28:23 +0000 (10:28 -0700)]
Merge "replaced deprecated getIntent with parseURI"
Brad Fitzpatrick [Mon, 14 Jun 2010 16:36:12 +0000 (09:36 -0700)]
am
6b9b8806: am
60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '
6b9b8806afb06e393203450bda8a53af08952590'
* commit '
6b9b8806afb06e393203450bda8a53af08952590':
Dropbox: remove redundant Entry construction.
Brad Fitzpatrick [Mon, 14 Jun 2010 16:34:22 +0000 (09:34 -0700)]
am
60e8c33d: Merge "Dropbox: remove redundant Entry construction." into gingerbread
Merge commit '
60e8c33d6f6caad2e963e91abca16a85cd3be82a' into gingerbread-plus-aosp
* commit '
60e8c33d6f6caad2e963e91abca16a85cd3be82a':
Dropbox: remove redundant Entry construction.
Steve Block [Mon, 14 Jun 2010 16:32:38 +0000 (09:32 -0700)]
Merge "Add the basic outline of the web runtime used to display installed web applications"
Brad Fitzpatrick [Mon, 14 Jun 2010 16:32:26 +0000 (09:32 -0700)]
Merge "Dropbox: remove redundant Entry construction." into gingerbread
Jean-Baptiste Queru [Mon, 14 Jun 2010 16:27:14 +0000 (09:27 -0700)]
Merge "Added an addAll to the ArrayAdapter"
Eric Laurent [Mon, 14 Jun 2010 16:10:32 +0000 (09:10 -0700)]
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.
Eric Laurent [Mon, 14 Jun 2010 16:07:03 +0000 (09:07 -0700)]
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.
Eric Laurent [Mon, 14 Jun 2010 16:04:33 +0000 (09:04 -0700)]
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.
Eric Laurent [Mon, 14 Jun 2010 16:02:13 +0000 (09:02 -0700)]
Merge "Issue
2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
Jean-Baptiste Queru [Mon, 14 Jun 2010 15:56:49 +0000 (08:56 -0700)]
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
Chih-Chung Chang [Mon, 14 Jun 2010 11:17:59 +0000 (04:17 -0700)]
am
da755ad3: am
f1cefa91: am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
da755ad331aa77fb3780b84c384a27d0217bf410'
* commit '
da755ad331aa77fb3780b84c384a27d0217bf410':
Correct the setDisplayOrientation sample code.
Chih-Chung Chang [Mon, 14 Jun 2010 11:14:09 +0000 (04:14 -0700)]
am
f1cefa91: am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
f1cefa916712dafc8b47f6eb8132a688892d4995' into gingerbread-plus-aosp
* commit '
f1cefa916712dafc8b47f6eb8132a688892d4995':
Correct the setDisplayOrientation sample code.
Chih-Chung Chang [Mon, 14 Jun 2010 11:11:00 +0000 (04:11 -0700)]
am
724c5224: Correct the setDisplayOrientation sample code.
Merge commit '
724c52244423feced2677fbd1f905e0b8b0639f2' into gingerbread
* commit '
724c52244423feced2677fbd1f905e0b8b0639f2':
Correct the setDisplayOrientation sample code.
Jeff Brown [Mon, 14 Jun 2010 03:28:29 +0000 (20:28 -0700)]
am
4166aec5: am
28a6c8e9: am
d890cbf7: Remove PollLoop from host build.
Merge commit '
4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b'
* commit '
4166aec567b6fa4aa725a20d7c0a6dc5866c9f7b':
Remove PollLoop from host build.