Commit Graph

14491 Commits

Author SHA1 Message Date
Dianne Hackborn
eb00f8f722 Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 2010-04-06 11:18:01 -07:00
Suchi Amalapurapu
5a0bcbafcb 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.
2010-04-06 11:00:08 -07:00
Suchi Amalapurapu
bed12215d0 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.
2010-04-06 10:55:43 -07:00
Irfan Sheriff
93392191d5 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
2010-04-06 10:52:52 -07:00
Suchi Amalapurapu
0a97468698 Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 10:50:56 -07:00
Irfan Sheriff
9a2a50bed3 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
2010-04-06 10:48:46 -07:00
Bjorn Bringert
acf50fa966 am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken

* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
  Guard against NPE in SearchManagerService
2010-04-06 09:00:51 -07:00
Bjorn Bringert
caefc0739c am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp

* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
  Guard against NPE in SearchManagerService
2010-04-06 08:57:01 -07:00
Bjorn Bringert
660557de27 Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 08:53:12 -07:00
Joe Onorato
3689034a24 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
2010-04-06 08:41:50 -07:00
Joe Onorato
01181e1b5d 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.
2010-04-06 08:41:42 -07:00
Joe Onorato
28b00ca814 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
2010-04-06 08:36:05 -07:00
Joe Onorato
07c0f3cebe Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Dianne Hackborn
db88a5899b 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
2010-04-05 18:52:39 -07:00
Dianne Hackborn
3abb362c29 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
2010-04-05 18:45:50 -07:00
Dianne Hackborn
81ecbe32de 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
2010-04-05 18:42:27 -07:00
Dianne Hackborn
6b007324e9 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
2010-04-05 18:39:04 -07:00
Dianne Hackborn
a388fe0a27 Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 2010-04-05 18:35:11 -07:00
Mathias Agopian
d84ff8d62a Merge "Make pixels prettier." into kraken 2010-04-05 18:22:44 -07:00
Mathias Agopian
8f10540cd5 Make pixels prettier.
Change-Id: If3b0774b70cbe943894c15ffa1da111ad887010f
2010-04-05 18:12:27 -07:00
Jim Miller
c13aae1e42 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
2010-04-05 17:25:17 -07:00
Jim Miller
5047c0841d 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
2010-04-05 17:21:20 -07:00
Jim Miller
3abdeafc34 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:16:00 -07:00
Dirk Dougherty
7ead4131d8 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
2010-04-05 16:51:22 -07:00
Dirk Dougherty
73b2cd72c4 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
2010-04-05 16:44:58 -07:00
Dirk Dougherty
95d321284e Merge "docs: add manifest documentation for installLocation" into froyo 2010-04-05 16:37:07 -07:00
Wei Huang
04ad44a964 am 6ba03118: am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9' into kraken

* commit '6ba03118790f57ec0c0c9d6ed3198de11a08b6a9':
  bug 2542580: fix bad icon.
2010-04-05 15:46:22 -07:00
Wei Huang
9d2687587d am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp

* commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
  bug 2542580: fix bad icon.
2010-04-05 15:42:30 -07:00
Wei Huang
86698b3ed3 Merge "bug 2542580: fix bad icon." into froyo 2010-04-05 15:36:40 -07:00
Doug Zongker
83e4a5c965 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
2010-04-05 15:22:59 -07:00
Doug Zongker
1044401a77 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
2010-04-05 15:19:49 -07:00
Doug Zongker
98303300fc Merge "remove OTA packages from the old (pre-froyo) updater" into froyo 2010-04-05 15:16:12 -07:00
Dan Morrill
f21a22f3f5 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
2010-04-05 15:03:48 -07:00
Kenny Root
fe83ccca89 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
2010-04-05 15:03:45 -07:00
Dan Morrill
316aaaf564 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
2010-04-05 14:59:47 -07:00
Kenny Root
72bb32ad7d 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
2010-04-05 14:59:44 -07:00
Dan Morrill
536267981d Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo 2010-04-05 14:56:03 -07:00
Kenny Root
5a58300e87 Merge "Revert to previous text selection behavior" into froyo 2010-04-05 14:55:10 -07:00
Jaikumar Ganesh
59d720f05c 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.
2010-04-05 14:53:41 -07:00
Jaikumar Ganesh
1508e13302 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.
2010-04-05 14:50:46 -07:00
Jaikumar Ganesh
0c0aa74138 Merge "Add an extra for the Disconnect Headset State." into froyo 2010-04-05 14:45:27 -07:00
Wei Huang
f079a0733a am d97eb7bd: am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb' into kraken

* commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb':
  bug #2542580: fix stat_notify_chat icon for mdpi resource.
2010-04-05 14:44:07 -07:00
Wei Huang
958f7eaf25 am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit 'badaa7782d76115154a63d47d02caec15832fcb9' into froyo-plus-aosp

* commit 'badaa7782d76115154a63d47d02caec15832fcb9':
  bug #2542580: fix stat_notify_chat icon for mdpi resource.
2010-04-05 14:40:23 -07:00
Wei Huang
16d235537b Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo 2010-04-05 14:36:47 -07:00
Amith Yamasani
fc7838f204 am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken

* commit '733a2f654934d452b2febf6f80cd1136830758d5':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
2010-04-05 14:25:31 -07:00
Amith Yamasani
7f5e6620e5 am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp

* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
2010-04-05 14:20:57 -07:00
Amith Yamasani
68e9e237c9 Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:17:55 -07:00
Ray Chen
6f88aab01b am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken

* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
  Make createVideoThumbnail and createImageThumbnail look consistent.
2010-04-05 13:19:39 -07:00
Ray Chen
24b5b5d7b4 am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp

* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
  Make createVideoThumbnail and createImageThumbnail look consistent.
2010-04-05 13:16:19 -07:00
Cary Clark
4f1f69f5f6 am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken

* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
  check for webviewcore before reading settings
2010-04-05 12:33:03 -07:00