OSDN Git Service
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.
Suchi Amalapurapu [Tue, 6 Apr 2010 17:55:43 +0000 (10:55 -0700)]
am
fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit '
fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp
* commit '
fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
Forcibly unmount the sdcard after N retries.
Irfan Sheriff [Tue, 6 Apr 2010 17:52:52 +0000 (10:52 -0700)]
am
7eeb44f2: am
b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit '
7eeb44f20527caaad618e28ba511e7661f5904cb' into kraken
* commit '
7eeb44f20527caaad618e28ba511e7661f5904cb':
Disable tethering when airplane mode is enabled
Suchi Amalapurapu [Tue, 6 Apr 2010 17:50:56 +0000 (10:50 -0700)]
Merge "Forcibly unmount the sdcard after N retries." into froyo
Irfan Sheriff [Tue, 6 Apr 2010 17:48:46 +0000 (10:48 -0700)]
am
b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit '
b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp
* commit '
b2e6c01f449f3fd4effee7029518684deb4e98f6':
Disable tethering when airplane mode is enabled
Bjorn Bringert [Tue, 6 Apr 2010 16:00:51 +0000 (09:00 -0700)]
am
16419aca: am
7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '
16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken
* commit '
16419aca40e9d570eef4f51133ba1b734d3012c0':
Guard against NPE in SearchManagerService
Bjorn Bringert [Tue, 6 Apr 2010 15:57:01 +0000 (08:57 -0700)]
am
7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '
7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '
7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Bjorn Bringert [Tue, 6 Apr 2010 15:53:12 +0000 (08:53 -0700)]
Merge "Guard against NPE in SearchManagerService" into froyo
Joe Onorato [Tue, 6 Apr 2010 15:41:50 +0000 (08:41 -0700)]
am
703cb724: am
fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit '
703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken
* commit '
703cb72442461a3cfb3ffd0d15968d7c40eaba65':
Redo the look of the recent apps switcher
Joe Onorato [Tue, 6 Apr 2010 15:41:42 +0000 (08:41 -0700)]
am
7d8866f9: Redo the look of the recent apps switcher.
Merge commit '
7d8866f9ef026870d4735d6f2ede49525150e53e' into kraken
* commit '
7d8866f9ef026870d4735d6f2ede49525150e53e':
Redo the look of the recent apps switcher.
Joe Onorato [Tue, 6 Apr 2010 15:36:05 +0000 (08:36 -0700)]
am
fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit '
fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp
* commit '
fa588fc37420a1a4d287e6307700ca310897308a':
Redo the look of the recent apps switcher
Joe Onorato [Tue, 6 Apr 2010 15:32:07 +0000 (08:32 -0700)]
Merge "Redo the look of the recent apps switcher" into froyo
Dianne Hackborn [Tue, 6 Apr 2010 01:52:39 +0000 (18:52 -0700)]
am
c94dad83: am
6e52b5d7:
2568467 System crash when installing corrupt APK
Merge commit '
c94dad83be792928206363cb43524a68b6a62ffe' into kraken
* commit '
c94dad83be792928206363cb43524a68b6a62ffe':
2568467 System crash when installing corrupt APK
Dianne Hackborn [Tue, 6 Apr 2010 01:45:50 +0000 (18:45 -0700)]
am
6e52b5d7:
2568467 System crash when installing corrupt APK
Merge commit '
6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '
6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Dianne Hackborn [Tue, 6 Apr 2010 01:42:27 +0000 (18:42 -0700)]
am
eab92d7b: am
01f6b75b: Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Merge commit '
eab92d7bec5ff0d12ee68047bba4ade3afb718a7' into kraken
* commit '
eab92d7bec5ff0d12ee68047bba4ade3afb718a7':
Fix issue #
2564479: Favorite Recipes App Installation Fail
Dianne Hackborn [Tue, 6 Apr 2010 01:39:04 +0000 (18:39 -0700)]
am
01f6b75b: Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Merge commit '
01f6b75baa3b9144240fa8c9772859ab4ac948bd' into froyo-plus-aosp
* commit '
01f6b75baa3b9144240fa8c9772859ab4ac948bd':
Fix issue #
2564479: Favorite Recipes App Installation Fail
Dianne Hackborn [Tue, 6 Apr 2010 01:35:11 +0000 (18:35 -0700)]
Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Mathias Agopian [Tue, 6 Apr 2010 01:22:44 +0000 (18:22 -0700)]
Merge "Make pixels prettier." into kraken
Mathias Agopian [Tue, 6 Apr 2010 01:01:24 +0000 (18:01 -0700)]
Make pixels prettier.
Change-Id: If3b0774b70cbe943894c15ffa1da111ad887010f
Jim Miller [Tue, 6 Apr 2010 00:25:17 +0000 (17:25 -0700)]
am
bf81cb91: am
a6cce790: Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit '
bf81cb91aa584d3b52d807aa4134a1a90569de31' into kraken
* commit '
bf81cb91aa584d3b52d807aa4134a1a90569de31':
Fix
2325549: Allow up to 4 lines of summary text in Settings
Jim Miller [Tue, 6 Apr 2010 00:21:20 +0000 (17:21 -0700)]
am
a6cce790: Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit '
a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp
* commit '
a6cce790b24debae49f1df9f039e83e3e29e5cd1':
Fix
2325549: Allow up to 4 lines of summary text in Settings
Jim Miller [Tue, 6 Apr 2010 00:16:00 +0000 (17:16 -0700)]
Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Dirk Dougherty [Mon, 5 Apr 2010 23:51:22 +0000 (16:51 -0700)]
am
e0143409: am
bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo
Merge commit '
e0143409af39e050b3137aef9baa72d86f32f8d5' into kraken
* commit '
e0143409af39e050b3137aef9baa72d86f32f8d5':
docs: add manifest documentation for installLocation
Dirk Dougherty [Mon, 5 Apr 2010 23:44:58 +0000 (16:44 -0700)]
am
bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo
Merge commit '
bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1' into froyo-plus-aosp
* commit '
bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1':
docs: add manifest documentation for installLocation
Dirk Dougherty [Mon, 5 Apr 2010 23:37:07 +0000 (16:37 -0700)]
Merge "docs: add manifest documentation for installLocation" into froyo
Wei Huang [Mon, 5 Apr 2010 22:46:22 +0000 (15:46 -0700)]
Wei Huang [Mon, 5 Apr 2010 22:42:30 +0000 (15:42 -0700)]
am
0abdf03d: Merge "bug
2542580: fix bad icon." into froyo
Merge commit '
0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp
* commit '
0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
bug
2542580: fix bad icon.
Wei Huang [Mon, 5 Apr 2010 22:36:40 +0000 (15:36 -0700)]
Merge "bug
2542580: fix bad icon." into froyo
Doug Zongker [Mon, 5 Apr 2010 22:22:59 +0000 (15:22 -0700)]
am
e725a963: am
4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit '
e725a9634b0cea150b29755ed94c53e621b4f273' into kraken
* commit '
e725a9634b0cea150b29755ed94c53e621b4f273':
remove OTA packages from the old (pre-froyo) updater
Doug Zongker [Mon, 5 Apr 2010 22:19:49 +0000 (15:19 -0700)]
am
4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit '
4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp
* commit '
4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
remove OTA packages from the old (pre-froyo) updater
Doug Zongker [Mon, 5 Apr 2010 22:16:12 +0000 (15:16 -0700)]
Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Dan Morrill [Mon, 5 Apr 2010 22:03:48 +0000 (15:03 -0700)]
am
ca5e7de8: am
21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit '
ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit '
ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
Kenny Root [Mon, 5 Apr 2010 22:03:45 +0000 (15:03 -0700)]
am
16197a24: am
0db37997: Merge "Revert to previous text selection behavior" into froyo
Merge commit '
16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken
* commit '
16197a246fdeff0167f9abdc6a3da5d83759993d':
Revert to previous text selection behavior
Dan Morrill [Mon, 5 Apr 2010 21:59:47 +0000 (14:59 -0700)]
am
21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit '
21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '
21390f08138801f9e008917c0c0149839a80d002':
Adding a feature definition for touchscreens that was overlooked in the last
Kenny Root [Mon, 5 Apr 2010 21:59:44 +0000 (14:59 -0700)]
am
0db37997: Merge "Revert to previous text selection behavior" into froyo
Merge commit '
0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp
* commit '
0db37997366a4d781af48be758a9d90b6d07d7d5':
Revert to previous text selection behavior
Dan Morrill [Mon, 5 Apr 2010 21:56:03 +0000 (14:56 -0700)]
Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Kenny Root [Mon, 5 Apr 2010 21:55:10 +0000 (14:55 -0700)]
Merge "Revert to previous text selection behavior" into froyo
Jaikumar Ganesh [Mon, 5 Apr 2010 21:53:41 +0000 (14:53 -0700)]
am
f84207f6: am
c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo
Merge commit '
f84207f6ca90307b10d94e484baf55330d644c1d' into kraken
* commit '
f84207f6ca90307b10d94e484baf55330d644c1d':
Add an extra for the Disconnect Headset State.
Jaikumar Ganesh [Mon, 5 Apr 2010 21:50:46 +0000 (14:50 -0700)]
am
c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo
Merge commit '
c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp
* commit '
c6af69b2684e1a95368f52e1f1614595f85c9c12':
Add an extra for the Disconnect Headset State.
Jaikumar Ganesh [Mon, 5 Apr 2010 21:45:27 +0000 (14:45 -0700)]
Merge "Add an extra for the Disconnect Headset State." into froyo
OSDN Git Service
