OSDN Git Service
Grace Kloba [Thu, 8 Apr 2010 01:28:43 +0000 (18:28 -0700)]
am
c020ec57: am
edee621f: am
faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Grace Kloba [Thu, 8 Apr 2010 01:26:38 +0000 (18:26 -0700)]
am
edee621f: am
faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Merge commit '
edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken
* commit '
edee621f5cdfa72437aa16a804ffc872f8ddf293':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
Grace Kloba [Thu, 8 Apr 2010 01:23:25 +0000 (18:23 -0700)]
am
faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Merge commit '
faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp
* commit '
faa2d970058557fa31d06d168b402d592c368aaf':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
Grace Kloba [Thu, 8 Apr 2010 01:18:17 +0000 (18:18 -0700)]
Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
John Wang [Thu, 8 Apr 2010 01:02:56 +0000 (18:02 -0700)]
am
90f2a71e: am
7ecf08fa: am
815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
John Wang [Thu, 8 Apr 2010 00:58:53 +0000 (17:58 -0700)]
am
7ecf08fa: am
815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
Merge commit '
7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken
* commit '
7ecf08faa9da7d372dd319aac8b1e5760a116601':
Add emergencyOnly indicator in ServiceState.
John Wang [Thu, 8 Apr 2010 00:54:27 +0000 (17:54 -0700)]
am
815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
Merge commit '
815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp
* commit '
815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
Add emergencyOnly indicator in ServiceState.
John Wang [Thu, 8 Apr 2010 00:51:41 +0000 (17:51 -0700)]
Merge "Add emergencyOnly indicator in ServiceState." into froyo
San Mehat [Wed, 7 Apr 2010 23:40:49 +0000 (16:40 -0700)]
am
12ebde61: am
692329cf: am
fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Suchi Amalapurapu [Wed, 7 Apr 2010 23:40:45 +0000 (16:40 -0700)]
am
070e1ecf: am
a137cf2a: am
4b18ced6: Merge "Fix
2578016." into froyo
San Mehat [Wed, 7 Apr 2010 23:36:07 +0000 (16:36 -0700)]
am
692329cf: am
fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Merge commit '
692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken
* commit '
692329cf3f1512b3f0475b619058f9a10d9950a8':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Suchi Amalapurapu [Wed, 7 Apr 2010 23:35:57 +0000 (16:35 -0700)]
San Mehat [Wed, 7 Apr 2010 23:32:29 +0000 (16:32 -0700)]
am
fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Merge commit '
fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp
* commit '
fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Suchi Amalapurapu [Wed, 7 Apr 2010 23:32:26 +0000 (16:32 -0700)]
San Mehat [Wed, 7 Apr 2010 22:32:44 +0000 (15:32 -0700)]
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
Suchi Amalapurapu [Wed, 7 Apr 2010 22:25:51 +0000 (15:25 -0700)]
Merge "Fix
2578016." into froyo
Christopher Tate [Wed, 7 Apr 2010 21:28:28 +0000 (14:28 -0700)]
am
3b045eb0: am
560607ca: am
98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Christopher Tate [Wed, 7 Apr 2010 21:24:48 +0000 (14:24 -0700)]
am
560607ca: am
98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Merge commit '
560607ca530d88869ac87e5875de7efdcd0f7b85' into kraken
* commit '
560607ca530d88869ac87e5875de7efdcd0f7b85':
Add Backup/Restore sample to the SDK docs
Christopher Tate [Wed, 7 Apr 2010 21:22:23 +0000 (14:22 -0700)]
am
98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
Merge commit '
98e26575373461dc16c749d1f756403e46a909d4' into froyo-plus-aosp
* commit '
98e26575373461dc16c749d1f756403e46a909d4':
Add Backup/Restore sample to the SDK docs
Christopher Tate [Wed, 7 Apr 2010 21:19:44 +0000 (14:19 -0700)]
Merge "Add Backup/Restore sample to the SDK docs" into froyo
Marco Nelissen [Wed, 7 Apr 2010 20:40:38 +0000 (13:40 -0700)]
am
724f3008: am
ca9a083b: am
e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Marco Nelissen [Wed, 7 Apr 2010 20:37:21 +0000 (13:37 -0700)]
am
ca9a083b: am
e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Merge commit '
ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken
* commit '
ca9a083bcf1ad753812e14f506c210a2104342c5':
Don't check whether a specific named activity supports mp3 playback,
Marco Nelissen [Wed, 7 Apr 2010 20:33:11 +0000 (13:33 -0700)]
am
e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Merge commit '
e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp
* commit '
e43e563e73ab6b1af2b3276a4917976b112f5cda':
Don't check whether a specific named activity supports mp3 playback,
Marco Nelissen [Wed, 7 Apr 2010 20:28:51 +0000 (13:28 -0700)]
Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Ray Chen [Wed, 7 Apr 2010 19:17:57 +0000 (12:17 -0700)]
am
84d12f3f: am
dbad286c: am
25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Ray Chen [Wed, 7 Apr 2010 19:14:49 +0000 (12:14 -0700)]
am
dbad286c: am
25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Merge commit '
dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit '
dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Ray Chen [Wed, 7 Apr 2010 19:09:42 +0000 (12:09 -0700)]
am
25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Merge commit '
25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp
* commit '
25c2dd60d43298c18b9459abd6ff33046d675fe6':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Ray Chen [Wed, 7 Apr 2010 19:05:58 +0000 (12:05 -0700)]
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Dianne Hackborn [Wed, 7 Apr 2010 19:03:05 +0000 (12:03 -0700)]
am
7aed1e14: am
d66e2b23: am
4e7cacd3: Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Dianne Hackborn [Wed, 7 Apr 2010 19:03:00 +0000 (12:03 -0700)]
am
d00fb429: am
03e352a2: am
8258fda1: Fix issue #
2576268: There is no uiMode config change constant for the manifest
Dianne Hackborn [Wed, 7 Apr 2010 18:58:21 +0000 (11:58 -0700)]
am
d66e2b23: am
4e7cacd3: Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '
d66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit '
d66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #
2568615: System server crashed in SyncStorageEngine
Dianne Hackborn [Wed, 7 Apr 2010 18:58:17 +0000 (11:58 -0700)]
am
03e352a2: am
8258fda1: Fix issue #
2576268: There is no uiMode config change constant for the manifest
Merge commit '
03e352a2850d74cee11d3f0734938efb22cac351' into kraken
* commit '
03e352a2850d74cee11d3f0734938efb22cac351':
Fix issue #
2576268: There is no uiMode config change constant for the manifest
Dianne Hackborn [Wed, 7 Apr 2010 18:52:21 +0000 (11:52 -0700)]
am
4e7cacd3: Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '
4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp
* commit '
4e7cacd3e44bd222a7892113336caff571a9983a':
Maybe fix issue #
2568615: System server crashed in SyncStorageEngine
Dianne Hackborn [Wed, 7 Apr 2010 18:52:17 +0000 (11:52 -0700)]
am
8258fda1: Fix issue #
2576268: There is no uiMode config change constant for the manifest
Merge commit '
8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp
* commit '
8258fda17741b4969b93ffbe8796c76e427a9f27':
Fix issue #
2576268: There is no uiMode config change constant for the manifest
Dianne Hackborn [Wed, 7 Apr 2010 18:49:37 +0000 (11:49 -0700)]
Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Andreas Huber [Wed, 7 Apr 2010 18:10:09 +0000 (11:10 -0700)]
am
1e6edab6: am
01f78928: am
567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Andreas Huber [Wed, 7 Apr 2010 18:05:56 +0000 (11:05 -0700)]
am
01f78928: am
567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '
01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken
* commit '
01f78928228cd097bc6816ae03909a2b01d5c1d5':
Report the requested seek time while seek is in progress.
Andreas Huber [Wed, 7 Apr 2010 18:02:11 +0000 (11:02 -0700)]
am
567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '
567b57b68884c68e3c95834589e5f7921f380a45' into froyo-plus-aosp
* commit '
567b57b68884c68e3c95834589e5f7921f380a45':
Report the requested seek time while seek is in progress.
Andreas Huber [Wed, 7 Apr 2010 17:58:05 +0000 (10:58 -0700)]
Merge "Report the requested seek time while seek is in progress." into froyo
Xia Wang [Wed, 7 Apr 2010 17:40:36 +0000 (10:40 -0700)]
am
3edc3c56: am
b151f48a: am
c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Romain Guy [Wed, 7 Apr 2010 17:40:32 +0000 (10:40 -0700)]
am
388fe1b0: am
2a9ec986: am
7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #
2565564
Xia Wang [Wed, 7 Apr 2010 17:36:31 +0000 (10:36 -0700)]
am
b151f48a: am
c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit '
b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken
* commit '
b151f48a06d9473a8ec079d928d4203d13e2568b':
Fix bug2537659
Romain Guy [Wed, 7 Apr 2010 17:36:28 +0000 (10:36 -0700)]
am
2a9ec986: am
7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #
2565564
Merge commit '
2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken
* commit '
2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
Search for focusable views only after layout has happened when the window is first created.
Xia Wang [Wed, 7 Apr 2010 17:32:38 +0000 (10:32 -0700)]
am
c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit '
c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp
* commit '
c93386cece18b8467c69004561e8f22b6b053d24':
Fix bug2537659
Romain Guy [Wed, 7 Apr 2010 17:32:34 +0000 (10:32 -0700)]
am
7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #
2565564
Merge commit '
7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp
* commit '
7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
Search for focusable views only after layout has happened when the window is first created.
Xia Wang [Wed, 7 Apr 2010 17:30:19 +0000 (10:30 -0700)]
Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Leon Scroggins [Wed, 7 Apr 2010 17:17:48 +0000 (10:17 -0700)]
am
84d2d10d: am
efaee761: am
083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Leon Scroggins [Wed, 7 Apr 2010 17:13:28 +0000 (10:13 -0700)]
am
efaee761: am
083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '
efaee761022305d74e63237d87809582514bd5e2' into kraken
* commit '
efaee761022305d74e63237d87809582514bd5e2':
Show the microphone when the search box is opened from browser
Leon Scroggins [Wed, 7 Apr 2010 17:09:06 +0000 (10:09 -0700)]
am
083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '
083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp
* commit '
083c715d06a99951429b38c62484f8c3caf43cd1':
Show the microphone when the search box is opened from browser
Leon Scroggins [Wed, 7 Apr 2010 17:04:50 +0000 (10:04 -0700)]
Merge "Show the microphone when the search box is opened from browser" into froyo
Adam Powell [Wed, 7 Apr 2010 16:58:54 +0000 (09:58 -0700)]
am
85a650fe: am
c696b0df: am
eb3d47e4: Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Adam Powell [Wed, 7 Apr 2010 16:54:32 +0000 (09:54 -0700)]
am
c696b0df: am
eb3d47e4: Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit '
c696b0df1e41f7cbd09c034e47570e6510d5a2e3' into kraken
* commit '
c696b0df1e41f7cbd09c034e47570e6510d5a2e3':
Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection
Adam Powell [Wed, 7 Apr 2010 16:51:48 +0000 (09:51 -0700)]
am
eb3d47e4: Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit '
eb3d47e43ac971b7d965db9a53ca92db2ce47d77' into froyo-plus-aosp
* commit '
eb3d47e43ac971b7d965db9a53ca92db2ce47d77':
Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection
Adam Powell [Wed, 7 Apr 2010 16:48:48 +0000 (09:48 -0700)]
Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Scott Main [Wed, 7 Apr 2010 16:26:46 +0000 (09:26 -0700)]
am
fae5961f: am
31a14585: am
f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Scott Main [Wed, 7 Apr 2010 16:23:24 +0000 (09:23 -0700)]
am
31a14585: am
f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Merge commit '
31a14585819ca2aacddb539dac0084f9d81172d2' into kraken
* commit '
31a14585819ca2aacddb539dac0084f9d81172d2':
docs: add a screenLayout and uiMode values for configChanges attribute
Scott Main [Wed, 7 Apr 2010 16:06:51 +0000 (09:06 -0700)]
am
f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Merge commit '
f61eade258d5274b8447c0ea936ee578b7dc063a' into froyo-plus-aosp
* commit '
f61eade258d5274b8447c0ea936ee578b7dc063a':
docs: add a screenLayout and uiMode values for configChanges attribute
Scott Main [Wed, 7 Apr 2010 16:02:59 +0000 (09:02 -0700)]
Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Daniel Sandler [Wed, 7 Apr 2010 13:50:34 +0000 (06:50 -0700)]
am
aea1443b: am
93720cad: am
c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Daniel Sandler [Wed, 7 Apr 2010 13:48:07 +0000 (06:48 -0700)]
am
93720cad: am
c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Merge commit '
93720cad0c2905e7d0a80aee154684396d8b0ed1' into kraken
* commit '
93720cad0c2905e7d0a80aee154684396d8b0ed1':
Add more WindowManager flags to ViewDebug.
Daniel Sandler [Wed, 7 Apr 2010 13:44:04 +0000 (06:44 -0700)]
am
c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Merge commit '
c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp
* commit '
c957ebef9755d15f92c27d690641995587c0ba2f':
Add more WindowManager flags to ViewDebug.
Daniel Sandler [Wed, 7 Apr 2010 13:40:26 +0000 (06:40 -0700)]
Merge "Add more WindowManager flags to ViewDebug." into froyo
Wu-cheng Li [Wed, 7 Apr 2010 06:17:00 +0000 (23:17 -0700)]
am
1bab46c6: am
14111d14: am
cae57d62: Fix SDK build.
Wu-cheng Li [Wed, 7 Apr 2010 06:12:29 +0000 (23:12 -0700)]
Wu-cheng Li [Wed, 7 Apr 2010 06:08:51 +0000 (23:08 -0700)]
Dan Egnor [Wed, 7 Apr 2010 05:11:01 +0000 (22:11 -0700)]
am
7da9fc2f: am
aa94842c: am
9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Dan Egnor [Wed, 7 Apr 2010 05:06:48 +0000 (22:06 -0700)]
am
aa94842c: am
9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Merge commit '
aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken
* commit '
aa94842c1ad16298e27adf07701bf0bb792e0a51':
Comment-only change to clarify the role and use of IntentService
Dan Egnor [Wed, 7 Apr 2010 05:03:04 +0000 (22:03 -0700)]
am
9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Merge commit '
9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp
* commit '
9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
Comment-only change to clarify the role and use of IntentService
Joe Onorato [Wed, 7 Apr 2010 05:02:18 +0000 (22:02 -0700)]
am
a240ce20: Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken
Dan Egnor [Wed, 7 Apr 2010 03:50:25 +0000 (20:50 -0700)]
Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Joe Onorato [Wed, 7 Apr 2010 01:26:39 +0000 (18:26 -0700)]
Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken
Brett Chabot [Wed, 7 Apr 2010 00:56:34 +0000 (17:56 -0700)]
am
7f41a992: am
f6d41580: am
0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Brett Chabot [Wed, 7 Apr 2010 00:44:33 +0000 (17:44 -0700)]
am
f6d41580: am
0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Merge commit '
f6d415805511bb938a2b6ce2b1ee22a184b3f2bb' into kraken
* commit '
f6d415805511bb938a2b6ce2b1ee22a184b3f2bb':
Add makefile so package manager test apks can get buitl from root.
Brett Chabot [Wed, 7 Apr 2010 00:36:49 +0000 (17:36 -0700)]
am
0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Merge commit '
0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp
* commit '
0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
Add makefile so package manager test apks can get buitl from root.
Jean-Baptiste Queru [Tue, 6 Apr 2010 23:36:09 +0000 (16:36 -0700)]
merge from kraken
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
Brett Chabot [Tue, 6 Apr 2010 23:31:14 +0000 (16:31 -0700)]
Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:44:22 +0000 (15:44 -0700)]
Merge policy from frameworks/policies/base
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:44:11 +0000 (15:44 -0700)]
Merge policy from frameworks/policies/base
Change-Id: I55bd6b5078290aa7cdeaae8d8b4141d744ccf152
Andreas Huber [Tue, 6 Apr 2010 21:50:05 +0000 (14:50 -0700)]
am
3e8b89bd: am
2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
Merge commit '
3e8b89bd8d35525019080205e7221063748a3f0a' into kraken
* commit '
3e8b89bd8d35525019080205e7221063748a3f0a':
Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
Andreas Huber [Tue, 6 Apr 2010 21:46:14 +0000 (14:46 -0700)]
am
2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
Merge commit '
2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7' into froyo-plus-aosp
* commit '
2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7':
Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
Andreas Huber [Tue, 6 Apr 2010 21:43:05 +0000 (14:43 -0700)]
Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
Kenny Root [Tue, 6 Apr 2010 21:38:59 +0000 (14:38 -0700)]
am
266bb3c5: am
f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo
Merge commit '
266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken
* commit '
266bb3c5de24e7daafdaad57152a6762f53b7cc3':
Fix last character of password field being visible after rotation
Kenny Root [Tue, 6 Apr 2010 21:36:36 +0000 (14:36 -0700)]
am
f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo
Merge commit '
f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp
* commit '
f1b256f5198d12952302ef2b6214a79927918866':
Fix last character of password field being visible after rotation
Kenny Root [Tue, 6 Apr 2010 21:33:24 +0000 (14:33 -0700)]
Merge "Fix last character of password field being visible after rotation" into froyo
Daniel Lehmann [Tue, 6 Apr 2010 21:17:57 +0000 (14:17 -0700)]
am
140d040b: am
d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:
2572239" into froyo
Merge commit '
140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '
140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Daniel Lehmann [Tue, 6 Apr 2010 21:14:21 +0000 (14:14 -0700)]
am
d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:
2572239" into froyo
Merge commit '
d8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit '
d8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Daniel Lehmann [Tue, 6 Apr 2010 21:10:04 +0000 (14:10 -0700)]
Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:
2572239" into froyo
Christopher Tate [Tue, 6 Apr 2010 19:43:23 +0000 (12:43 -0700)]
am
ccb2c6cf: am
1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit '
ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken
* commit '
ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
Fix 'bmgr restore'
Grace Kloba [Tue, 6 Apr 2010 19:43:19 +0000 (12:43 -0700)]
am
8dbf5105: am
54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '
8dbf5105739db2354057be445483a63ec96376f0' into kraken
* commit '
8dbf5105739db2354057be445483a63ec96376f0':
Update the Webkit version.
Romain Guy [Tue, 6 Apr 2010 19:43:16 +0000 (12:43 -0700)]
am
92b46ffb: am
bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #
2549649" into froyo
Merge commit '
92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken
* commit '
92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
Correctly resize dialogs when measured in WRAP_CONTENT
Dianne Hackborn [Tue, 6 Apr 2010 19:43:00 +0000 (12:43 -0700)]
am
710312b3: am
48bce451: Merge "Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '
710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken
* commit '
710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
Christopher Tate [Tue, 6 Apr 2010 19:38:50 +0000 (12:38 -0700)]
am
1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit '
1bfcaa592cb10059d185d8408935571d16727f54' into froyo-plus-aosp
* commit '
1bfcaa592cb10059d185d8408935571d16727f54':
Fix 'bmgr restore'
Grace Kloba [Tue, 6 Apr 2010 19:38:47 +0000 (12:38 -0700)]
am
54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '
54fccf8a074f1b743df5b270c4f85e0e602d7f46' into froyo-plus-aosp
* commit '
54fccf8a074f1b743df5b270c4f85e0e602d7f46':
Update the Webkit version.
Romain Guy [Tue, 6 Apr 2010 19:38:33 +0000 (12:38 -0700)]
am
bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #
2549649" into froyo
Merge commit '
bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit '
bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Dianne Hackborn [Tue, 6 Apr 2010 19:38:22 +0000 (12:38 -0700)]
am
48bce451: Merge "Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '
48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp
* commit '
48bce4515d948971a122a1e17fd1919f81297d77':
Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
Christopher Tate [Tue, 6 Apr 2010 19:19:11 +0000 (12:19 -0700)]
Merge "Fix 'bmgr restore'" into froyo
Grace Kloba [Tue, 6 Apr 2010 18:50:32 +0000 (11:50 -0700)]
Merge "Update the Webkit version." into froyo
Romain Guy [Tue, 6 Apr 2010 18:25:43 +0000 (11:25 -0700)]
Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #
2549649" into froyo
Dianne Hackborn [Tue, 6 Apr 2010 18:18:01 +0000 (11:18 -0700)]
Merge "Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Suchi Amalapurapu [Tue, 6 Apr 2010 18:00:08 +0000 (11:00 -0700)]
am
e6fdab7f: am
fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit '
e6fdab7f005cc06df989c97907c3cc3060692121' into kraken
* commit '
e6fdab7f005cc06df989c97907c3cc3060692121':
Forcibly unmount the sdcard after N retries.
OSDN Git Service
