OSDN Git Service
Fred Quintana [Fri, 2 Apr 2010 18:12:13 +0000 (11:12 -0700)]
am
a269a54e: am
3667b9b4: am
30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Fred Quintana [Fri, 2 Apr 2010 18:00:30 +0000 (11:00 -0700)]
am
3667b9b4: am
30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Merge commit '
3667b9b471a6585d22106cbfe4a04111ca86643c' into kraken
* commit '
3667b9b471a6585d22106cbfe4a04111ca86643c':
revert the stripping of System Group:
Fred Quintana [Fri, 2 Apr 2010 17:53:22 +0000 (10:53 -0700)]
am
30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Merge commit '
30ed25c252e9eb9923d71676e8f703bb775b7cdf' into froyo-plus-aosp
* commit '
30ed25c252e9eb9923d71676e8f703bb775b7cdf':
revert the stripping of System Group:
Fred Quintana [Fri, 2 Apr 2010 17:47:11 +0000 (10:47 -0700)]
Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Brett Chabot [Fri, 2 Apr 2010 17:42:30 +0000 (10:42 -0700)]
am
4082e733: am
f5071884: am
c1548e38: Merge "Add test annotations to frameworks common tests." into froyo
Brett Chabot [Fri, 2 Apr 2010 17:33:51 +0000 (10:33 -0700)]
am
f5071884: am
c1548e38: Merge "Add test annotations to frameworks common tests." into froyo
Merge commit '
f5071884809219edb420a4f7c4a0eef9523d7bca' into kraken
* commit '
f5071884809219edb420a4f7c4a0eef9523d7bca':
Add test annotations to frameworks common tests.
Brett Chabot [Fri, 2 Apr 2010 17:28:36 +0000 (10:28 -0700)]
am
c1548e38: Merge "Add test annotations to frameworks common tests." into froyo
Merge commit '
c1548e3819ab4662e6b5f5455f95258b37dc7192' into froyo-plus-aosp
* commit '
c1548e3819ab4662e6b5f5455f95258b37dc7192':
Add test annotations to frameworks common tests.
Brett Chabot [Fri, 2 Apr 2010 17:24:00 +0000 (10:24 -0700)]
Merge "Add test annotations to frameworks common tests." into froyo
Grace Kloba [Fri, 2 Apr 2010 16:28:53 +0000 (09:28 -0700)]
am
c23799bc: am
f34d9e20: am
61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo
Jean-Michel Trivi [Fri, 2 Apr 2010 16:28:50 +0000 (09:28 -0700)]
am
055897ac: am
28525488: am
9ab05fff: Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Dave Sparks [Fri, 2 Apr 2010 16:28:46 +0000 (09:28 -0700)]
am
4cd79e3c: am
6c8770df: am
d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Kenny Root [Fri, 2 Apr 2010 16:24:02 +0000 (09:24 -0700)]
Merge "Fix
2566319, don't use package-protected members from Layout in test."
Grace Kloba [Fri, 2 Apr 2010 16:22:07 +0000 (09:22 -0700)]
am
f34d9e20: am
61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo
Merge commit '
f34d9e20c7f4c5537beb4287c79b24ab351bcda4' into kraken
* commit '
f34d9e20c7f4c5537beb4287c79b24ab351bcda4':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Grace Kloba [Fri, 2 Apr 2010 16:19:06 +0000 (09:19 -0700)]
am
61c3a13e: Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window\'s main WebView. It is only non-null if the WebView\'s window has the focus." into froyo
Merge commit '
61c3a13e5f9d20c621f49598a0082063404c5f7e' into froyo-plus-aosp
* commit '
61c3a13e5f9d20c621f49598a0082063404c5f7e':
Instead of holding an ApplicationContext, JWebCoreJavaBridge
Jean-Michel Trivi [Fri, 2 Apr 2010 16:16:05 +0000 (09:16 -0700)]
am
28525488: am
9ab05fff: Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Merge commit '
28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken
* commit '
28525488fb5769fb119b01db17dc0ed305f0e7b0':
Fix bug
2565463 Ensure an object cannot appear twice in the
Dave Sparks [Fri, 2 Apr 2010 16:16:02 +0000 (09:16 -0700)]
am
6c8770df: am
d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Merge commit '
6c8770df939782d767fdf2cdb68c4a289015a5e6' into kraken
* commit '
6c8770df939782d767fdf2cdb68c4a289015a5e6':
Use local lock for most MediaMetadataRetriever methods. Bug
2560834.
Grace Kloba [Fri, 2 Apr 2010 16:14:39 +0000 (09:14 -0700)]
Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo
Jean-Michel Trivi [Fri, 2 Apr 2010 16:12:10 +0000 (09:12 -0700)]
am
9ab05fff: Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Merge commit '
9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp
* commit '
9ab05fff41e983c9b3175096c320aefced81276b':
Fix bug
2565463 Ensure an object cannot appear twice in the
Dave Sparks [Fri, 2 Apr 2010 16:11:56 +0000 (09:11 -0700)]
am
d9c16c37: Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Merge commit '
d9c16c37ea28933973f32cb434f770226266b675' into froyo-plus-aosp
* commit '
d9c16c37ea28933973f32cb434f770226266b675':
Use local lock for most MediaMetadataRetriever methods. Bug
2560834.
Jean-Michel Trivi [Fri, 2 Apr 2010 15:53:42 +0000 (08:53 -0700)]
Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Brett Chabot [Fri, 2 Apr 2010 15:53:22 +0000 (08:53 -0700)]
Add test annotations to frameworks common tests.
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
Dave Sparks [Fri, 2 Apr 2010 14:56:44 +0000 (07:56 -0700)]
Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Brett Chabot [Fri, 2 Apr 2010 06:49:07 +0000 (23:49 -0700)]
am
fad2eca2: am
16d77b8d: am
c162668e: Merge "More framework tests cleanup." into froyo
Mike Lockwood [Fri, 2 Apr 2010 06:49:00 +0000 (23:49 -0700)]
am
dfcb20d1: am
a9e1a131: am
87e72cd3: Merge "Vibrate before shutting down." into froyo
Jim Miller [Fri, 2 Apr 2010 06:48:50 +0000 (23:48 -0700)]
am
64265cc5: am
15be35f6: am
bf1259b8: Fix
2538826: Allow aspect of LockPatternView to be customized.
Mike LeBeau [Fri, 2 Apr 2010 06:48:42 +0000 (23:48 -0700)]
am
e86e0d1e: am
3079afaa: am
af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correc
Charles Chen [Fri, 2 Apr 2010 06:48:34 +0000 (23:48 -0700)]
am
89261412: am
9ea4668c: am
ddc2eb8e: Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Yu Shan Emily Lau [Fri, 2 Apr 2010 06:48:17 +0000 (23:48 -0700)]
am
05e7aedd: am
948e7dc0: am
e11bafec: Add the test template for the media audio manager test.
Mike LeBeau [Fri, 2 Apr 2010 06:48:13 +0000 (23:48 -0700)]
am
40330aae: am
2e1cd1cd: am
e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Brett Chabot [Fri, 2 Apr 2010 04:53:19 +0000 (21:53 -0700)]
am
16d77b8d: am
c162668e: Merge "More framework tests cleanup." into froyo
Merge commit '
16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed' into kraken
* commit '
16d77b8d42e5ae3ceb021aaa0dad387ea7c167ed':
More framework tests cleanup.
Brett Chabot [Fri, 2 Apr 2010 04:50:00 +0000 (21:50 -0700)]
am
c162668e: Merge "More framework tests cleanup." into froyo
Merge commit '
c162668e870cda9d336741f24c177cd925fef8e0' into froyo-plus-aosp
* commit '
c162668e870cda9d336741f24c177cd925fef8e0':
More framework tests cleanup.
Brett Chabot [Fri, 2 Apr 2010 04:45:41 +0000 (21:45 -0700)]
Merge "More framework tests cleanup." into froyo
Mike Lockwood [Fri, 2 Apr 2010 04:15:11 +0000 (21:15 -0700)]
am
a9e1a131: am
87e72cd3: Merge "Vibrate before shutting down." into froyo
Merge commit '
a9e1a131e3a5dcde4d69ee9f99aee4702dcff909' into kraken
* commit '
a9e1a131e3a5dcde4d69ee9f99aee4702dcff909':
Vibrate before shutting down.
Mike Lockwood [Fri, 2 Apr 2010 04:12:56 +0000 (21:12 -0700)]
am
87e72cd3: Merge "Vibrate before shutting down." into froyo
Merge commit '
87e72cd3b327fefc39030a628e9e9b7141791d39' into froyo-plus-aosp
* commit '
87e72cd3b327fefc39030a628e9e9b7141791d39':
Vibrate before shutting down.
Mike Lockwood [Fri, 2 Apr 2010 04:08:53 +0000 (21:08 -0700)]
Merge "Vibrate before shutting down." into froyo
Jim Miller [Fri, 2 Apr 2010 02:41:00 +0000 (19:41 -0700)]
am
15be35f6: am
bf1259b8: Fix
2538826: Allow aspect of LockPatternView to be customized.
Merge commit '
15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken
* commit '
15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
Fix
2538826: Allow aspect of LockPatternView to be customized.
Jim Miller [Fri, 2 Apr 2010 02:37:41 +0000 (19:37 -0700)]
am
bf1259b8: Fix
2538826: Allow aspect of LockPatternView to be customized.
Merge commit '
bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp
* commit '
bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
Fix
2538826: Allow aspect of LockPatternView to be customized.
Jeff Hamilton [Fri, 2 Apr 2010 01:22:39 +0000 (18:22 -0700)]
Merge "Add an option to not register the ContentObserver when creating a CursorAdapter."
Mike LeBeau [Fri, 2 Apr 2010 01:19:54 +0000 (18:19 -0700)]
am
3079afaa: am
af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by
Merge commit '
3079afaaf549316483a0f30d22eb157656ca7951' into kraken
* commit '
3079afaaf549316483a0f30d22eb157656ca7951':
Use flattenToShortString instead of toShortString on ComponentNames to
Mike LeBeau [Fri, 2 Apr 2010 01:14:30 +0000 (18:14 -0700)]
am
af8c900a: Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentNam
Merge commit '
af8c900a18288ef4ddfa2cebfa0555b8a37f92a7' into froyo-plus-aosp
* commit '
af8c900a18288ef4ddfa2cebfa0555b8a37f92a7':
Use flattenToShortString instead of toShortString on ComponentNames to
Mike LeBeau [Fri, 2 Apr 2010 01:11:43 +0000 (18:11 -0700)]
Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo
Charles Chen [Fri, 2 Apr 2010 01:05:21 +0000 (18:05 -0700)]
am
9ea4668c: am
ddc2eb8e: Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Merge commit '
9ea4668c3fabba6d9b8e610030d2ba370b782e86' into kraken
* commit '
9ea4668c3fabba6d9b8e610030d2ba370b782e86':
Fix for bug
2564771 - pitch setting between apps can
Charles Chen [Fri, 2 Apr 2010 00:59:57 +0000 (17:59 -0700)]
am
ddc2eb8e: Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Merge commit '
ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76' into froyo-plus-aosp
* commit '
ddc2eb8ee3c422b9f57bf55c50a76c7afb4ced76':
Fix for bug
2564771 - pitch setting between apps can
Charles Chen [Fri, 2 Apr 2010 00:56:47 +0000 (17:56 -0700)]
Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Yu Shan Emily Lau [Fri, 2 Apr 2010 00:50:53 +0000 (17:50 -0700)]
am
948e7dc0: am
e11bafec: Add the test template for the media audio manager test.
Merge commit '
948e7dc0ab6f0fae71fa76a438d084928d36569f' into kraken
* commit '
948e7dc0ab6f0fae71fa76a438d084928d36569f':
Add the test template for the media audio manager test.
Mike LeBeau [Fri, 2 Apr 2010 00:50:48 +0000 (17:50 -0700)]
am
2e1cd1cd: am
e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Merge commit '
2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1' into kraken
* commit '
2e1cd1cd00527de2a2f259e8b2891bbac0ef4ab1':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
Yu Shan Emily Lau [Fri, 2 Apr 2010 00:43:27 +0000 (17:43 -0700)]
am
e11bafec: Add the test template for the media audio manager test.
Merge commit '
e11bafec8d6c887c6ae95fa3d39c202859e86d48' into froyo-plus-aosp
* commit '
e11bafec8d6c887c6ae95fa3d39c202859e86d48':
Add the test template for the media audio manager test.
Mike LeBeau [Fri, 2 Apr 2010 00:42:38 +0000 (17:42 -0700)]
am
e134279f: Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Merge commit '
e134279ffa3d5a3871fd39e9e9328b3ab1fec88d' into froyo-plus-aosp
* commit '
e134279ffa3d5a3871fd39e9e9328b3ab1fec88d':
Also send EXTRA_CALLING_PACKAGE for voice search intents that do web
Mike LeBeau [Thu, 1 Apr 2010 22:30:51 +0000 (15:30 -0700)]
Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Gilles Debunne [Thu, 1 Apr 2010 22:02:26 +0000 (15:02 -0700)]
am
c97c54ce: am
55686d2c: am
83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo
Gilles Debunne [Thu, 1 Apr 2010 21:53:19 +0000 (14:53 -0700)]
am
55686d2c: am
83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo
Merge commit '
55686d2cdaa4e0e1d55a8cdd49dc871107cd54f7' into kraken
* commit '
55686d2cdaa4e0e1d55a8cdd49dc871107cd54f7':
Refactor in PositionTesterContextMenuListener.
Brett Chabot [Thu, 1 Apr 2010 21:53:02 +0000 (14:53 -0700)]
am
7f569331: am
dbecc902: am
f6118617: Merge "Remove FrameworkTest package." into froyo
Gilles Debunne [Thu, 1 Apr 2010 21:49:51 +0000 (14:49 -0700)]
am
83d4eb6c: Merge "Refactor in PositionTesterContextMenuListener." into froyo
Merge commit '
83d4eb6c4fc35bd8ce203edde0051d4def8c2cef' into froyo-plus-aosp
* commit '
83d4eb6c4fc35bd8ce203edde0051d4def8c2cef':
Refactor in PositionTesterContextMenuListener.
Gilles Debunne [Thu, 1 Apr 2010 21:47:00 +0000 (14:47 -0700)]
Merge "Refactor in PositionTesterContextMenuListener." into froyo
Brett Chabot [Thu, 1 Apr 2010 21:44:26 +0000 (14:44 -0700)]
am
dbecc902: am
f6118617: Merge "Remove FrameworkTest package." into froyo
Merge commit '
dbecc90220e924fc8c693dd903679e0e9d562820' into kraken
* commit '
dbecc90220e924fc8c693dd903679e0e9d562820':
Remove FrameworkTest package.
Fred Quintana [Thu, 1 Apr 2010 21:44:11 +0000 (14:44 -0700)]
am
cb3f6e9f: am
2aa2f78e: am
e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
Brett Chabot [Thu, 1 Apr 2010 21:40:43 +0000 (14:40 -0700)]
am
f6118617: Merge "Remove FrameworkTest package." into froyo
Merge commit '
f6118617350c0c1541550bf3a558460db562b6a4' into froyo-plus-aosp
* commit '
f6118617350c0c1541550bf3a558460db562b6a4':
Remove FrameworkTest package.
Fred Quintana [Thu, 1 Apr 2010 21:37:34 +0000 (14:37 -0700)]
am
2aa2f78e: am
e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
Merge commit '
2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc' into kraken
* commit '
2aa2f78ec553993de4cc7a30529e4fd9ce3b9cbc':
allow null authtokens to invalidateAuthToken
Brett Chabot [Thu, 1 Apr 2010 21:36:36 +0000 (14:36 -0700)]
Merge "Remove FrameworkTest package." into froyo
Fred Quintana [Thu, 1 Apr 2010 21:32:51 +0000 (14:32 -0700)]
am
e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo
Merge commit '
e8b1971c7b09f14f2d9a2e12399294798cf2066a' into froyo-plus-aosp
* commit '
e8b1971c7b09f14f2d9a2e12399294798cf2066a':
allow null authtokens to invalidateAuthToken
Fred Quintana [Thu, 1 Apr 2010 21:27:00 +0000 (14:27 -0700)]
Merge "allow null authtokens to invalidateAuthToken" into froyo
Derek Sollenberger [Thu, 1 Apr 2010 19:19:00 +0000 (12:19 -0700)]
am
d3bafad8: am
4c932079: am
11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Derek Sollenberger [Thu, 1 Apr 2010 19:10:03 +0000 (12:10 -0700)]
am
4c932079: am
11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '
4c93207940aa70b3f777fe14dce1bf580e1b71ba' into kraken
* commit '
4c93207940aa70b3f777fe14dce1bf580e1b71ba':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Derek Sollenberger [Thu, 1 Apr 2010 19:06:25 +0000 (12:06 -0700)]
am
11fb6144: Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '
11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp
* commit '
11fb6144604fbd1148695421e9ab6896701a431b':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Dirk Dougherty [Thu, 1 Apr 2010 17:56:56 +0000 (10:56 -0700)]
am
7fb51bf5: am
865bd884: am
2d8234b7: Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
James Dong [Thu, 1 Apr 2010 17:56:47 +0000 (10:56 -0700)]
am
85bc2ae1: am
d12d6c30: am
ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Dirk Dougherty [Thu, 1 Apr 2010 17:47:00 +0000 (10:47 -0700)]
am
865bd884: am
2d8234b7: Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '
865bd884e878bbc6d9f5832fda6971c21754b588' into kraken
* commit '
865bd884e878bbc6d9f5832fda6971c21754b588':
doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
James Dong [Thu, 1 Apr 2010 17:46:57 +0000 (10:46 -0700)]
am
d12d6c30: am
ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Merge commit '
d12d6c305caeea556781083152e741bdb3863eff' into kraken
* commit '
d12d6c305caeea556781083152e741bdb3863eff':
Public API changes for CameraProfile and CamcorderProfile classes
Dirk Dougherty [Thu, 1 Apr 2010 17:40:15 +0000 (10:40 -0700)]
am
2d8234b7: Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '
2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp
* commit '
2d8234b73d11fdc2178232cabad3ffaa23723405':
doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
James Dong [Thu, 1 Apr 2010 17:40:11 +0000 (10:40 -0700)]
am
ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Merge commit '
ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp
* commit '
ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
Public API changes for CameraProfile and CamcorderProfile classes
Robert Greenwalt [Thu, 1 Apr 2010 17:36:05 +0000 (10:36 -0700)]
am
4e925f8a: am
cab133a7: am
33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Dirk Dougherty [Thu, 1 Apr 2010 17:35:21 +0000 (10:35 -0700)]
Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
James Dong [Thu, 1 Apr 2010 17:33:45 +0000 (10:33 -0700)]
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Robert Greenwalt [Thu, 1 Apr 2010 17:27:04 +0000 (10:27 -0700)]
am
cab133a7: am
33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Merge commit '
cab133a7fa39969f136e3f401f97f6ce843514bb' into kraken
* commit '
cab133a7fa39969f136e3f401f97f6ce843514bb':
NetworkManagementService: Add interface counters & throttle API
Robert Greenwalt [Thu, 1 Apr 2010 17:22:51 +0000 (10:22 -0700)]
am
33eb7767: Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Merge commit '
33eb7767fb49482643df80c8b5567da83aa0e49f' into froyo-plus-aosp
* commit '
33eb7767fb49482643df80c8b5567da83aa0e49f':
NetworkManagementService: Add interface counters & throttle API
Robert Greenwalt [Thu, 1 Apr 2010 17:19:57 +0000 (10:19 -0700)]
Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Kristian Monsen [Thu, 1 Apr 2010 17:07:34 +0000 (10:07 -0700)]
am
86a09e4d: am
4ba57a4e: am
70c22a48: Merge "Fix for bug
2558156: Encodig is null" into froyo
Dave Sparks [Thu, 1 Apr 2010 17:00:16 +0000 (10:00 -0700)]
am
a74a751c: am
5100df84: am
49e5a4c5: Update AMR codec.
Kristian Monsen [Thu, 1 Apr 2010 17:00:08 +0000 (10:00 -0700)]
am
4ba57a4e: am
70c22a48: Merge "Fix for bug
2558156: Encodig is null" into froyo
Merge commit '
4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken
* commit '
4ba57a4e0ab56126e54d5c7137cfda1d47845578':
Fix for bug
2558156: Encodig is null
Kristian Monsen [Thu, 1 Apr 2010 16:57:12 +0000 (09:57 -0700)]
am
70c22a48: Merge "Fix for bug
2558156: Encodig is null" into froyo
Merge commit '
70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp
* commit '
70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
Fix for bug
2558156: Encodig is null
Kristian Monsen [Thu, 1 Apr 2010 16:54:47 +0000 (09:54 -0700)]
Merge "Fix for bug
2558156: Encodig is null" into froyo
Dave Sparks [Thu, 1 Apr 2010 16:51:42 +0000 (09:51 -0700)]
Dave Sparks [Thu, 1 Apr 2010 16:47:58 +0000 (09:47 -0700)]
am
49e5a4c5: Update AMR codec.
Merge commit '
49e5a4c5be2e8ba114efff8d0634a34867cb2c26' into froyo-plus-aosp
* commit '
49e5a4c5be2e8ba114efff8d0634a34867cb2c26':
Update AMR codec.
Kenny Root [Thu, 1 Apr 2010 16:01:45 +0000 (09:01 -0700)]
Merge "Don't measure for a secondary caret unless we have one."
Ben Murdoch [Thu, 1 Apr 2010 15:53:41 +0000 (08:53 -0700)]
am
2e646429: am
bf691348: am
352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Ben Murdoch [Thu, 1 Apr 2010 15:47:58 +0000 (08:47 -0700)]
am
bf691348: am
352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit '
bf6913481eff68a69d1e6ba312227e2fcea29793' into kraken
* commit '
bf6913481eff68a69d1e6ba312227e2fcea29793':
Cherry pick from master.
Cherry pick from master.
Ben Murdoch [Thu, 1 Apr 2010 15:44:58 +0000 (08:44 -0700)]
am
352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit '
352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp
* commit '
352cf1a45e26803a466d096ca2d679ea5a3ac249':
Cherry pick from master.
Cherry pick from master.
Ben Murdoch [Thu, 1 Apr 2010 15:42:14 +0000 (08:42 -0700)]
Merge changes Ic9531e3c,I3f04433b into froyo
* changes:
Cherry pick from master.
Cherry pick from master.
Grace Kloba [Thu, 1 Apr 2010 15:26:07 +0000 (08:26 -0700)]
am
0aca8f9c: am
fe72c533: am
461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Grace Kloba [Thu, 1 Apr 2010 15:20:48 +0000 (08:20 -0700)]
am
fe72c533: am
461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Merge commit '
fe72c533fe210e147111e0a862360032365dd987' into kraken
* commit '
fe72c533fe210e147111e0a862360032365dd987':
As we don't support over scroll any more, we need
Grace Kloba [Thu, 1 Apr 2010 15:17:35 +0000 (08:17 -0700)]
am
461cef5d: Merge "As we don\'t support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Merge commit '
461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp
* commit '
461cef5d209fd072c82f6a70eb106e4690b7ef97':
As we don't support over scroll any more, we need
Grace Kloba [Thu, 1 Apr 2010 15:15:09 +0000 (08:15 -0700)]
Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Romain Guy [Thu, 1 Apr 2010 08:02:01 +0000 (01:02 -0700)]
Merge "Don't ignore the parameters passed to the load methods."
Eric Laurent [Thu, 1 Apr 2010 06:45:27 +0000 (23:45 -0700)]
am
673e6720: am
110c432e: am
3fe1708d: Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Eric Laurent [Thu, 1 Apr 2010 06:39:41 +0000 (23:39 -0700)]
am
110c432e: am
3fe1708d: Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
110c432e6c90c604d955b795f91fe08c35f49e60' into kraken
* commit '
110c432e6c90c604d955b795f91fe08c35f49e60':
Fix isssue
2548710: Native AudioTrack resources never freed.
Eric Laurent [Thu, 1 Apr 2010 06:37:02 +0000 (23:37 -0700)]
am
3fe1708d: Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Merge commit '
3fe1708d9d204fa63e8abe6e434378d89e963752' into froyo-plus-aosp
* commit '
3fe1708d9d204fa63e8abe6e434378d89e963752':
Fix isssue
2548710: Native AudioTrack resources never freed.
Dianne Hackborn [Thu, 1 Apr 2010 06:34:24 +0000 (23:34 -0700)]
am
3bd18537: am
6ff57ee3: am
db3ea3d0: Merge "Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Dianne Hackborn [Thu, 1 Apr 2010 06:34:16 +0000 (23:34 -0700)]
am
d0b5b3cb: am
2d8d4d7b: am
513ae361: Merge "Fix issue #
2560791: Expose API to go in to car mode." into froyo
Dianne Hackborn [Thu, 1 Apr 2010 06:34:13 +0000 (23:34 -0700)]
am
aa3bbe9c: am
025f3933: am
686f7911: Merge "Fix issue #
2561067: Screen Display half faded..." into froyo
Xia Wang [Thu, 1 Apr 2010 06:34:09 +0000 (23:34 -0700)]
am
3946101c: am
c2eb4094: am
de1b1872: Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
OSDN Git Service
