OSDN Git Service
Mike Lockwood [Wed, 31 Mar 2010 00:35:18 +0000 (17:35 -0700)]
am
835f41da: (-s ours) am
8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '
835f41da7581747b6a03227bcd1e073074ea9329' into kraken
* commit '
835f41da7581747b6a03227bcd1e073074ea9329':
Add support for GPS privacy lock. DO NOT MERGE
Mike Lockwood [Wed, 31 Mar 2010 00:32:24 +0000 (17:32 -0700)]
am
8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Merge commit '
8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp
* commit '
8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
Add support for GPS privacy lock. DO NOT MERGE
Mike Lockwood [Wed, 31 Mar 2010 00:29:41 +0000 (17:29 -0700)]
Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Daniel Lehmann [Wed, 31 Mar 2010 00:05:42 +0000 (17:05 -0700)]
am
1b679754: am
58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:
2546767" into froyo
Merge commit '
1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken
* commit '
1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
Don't load photo if it's id is 0. Saves one database query
Daniel Lehmann [Wed, 31 Mar 2010 00:01:45 +0000 (17:01 -0700)]
am
58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:
2546767" into froyo
Merge commit '
58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp
* commit '
58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
Don't load photo if it's id is 0. Saves one database query
Daniel Lehmann [Tue, 30 Mar 2010 23:58:38 +0000 (16:58 -0700)]
Merge "Don't load photo if it's id is 0. Saves one database query Bug:
2546767" into froyo
Adam Powell [Tue, 30 Mar 2010 23:54:43 +0000 (16:54 -0700)]
am
9ebc9f46: am
3ac51b3d: Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '
9ebc9f464f45ec30003cd30854188a376c6d155f' into kraken
* commit '
9ebc9f464f45ec30003cd30854188a376c6d155f':
Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items
Christopher Tate [Tue, 30 Mar 2010 23:54:39 +0000 (16:54 -0700)]
am
82a8b363: am
27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '
82a8b3632c28d18d58a585160163fbf63d0c9746' into kraken
* commit '
82a8b3632c28d18d58a585160163fbf63d0c9746':
API CHANGE: @hide AbsoluteFileBackupHelper
Adam Powell [Tue, 30 Mar 2010 23:50:41 +0000 (16:50 -0700)]
am
3ac51b3d: Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Merge commit '
3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp
* commit '
3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items
Christopher Tate [Tue, 30 Mar 2010 23:50:36 +0000 (16:50 -0700)]
am
27a63583: API CHANGE: @hide AbsoluteFileBackupHelper
Merge commit '
27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp
* commit '
27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
API CHANGE: @hide AbsoluteFileBackupHelper
Adam Powell [Tue, 30 Mar 2010 23:46:21 +0000 (16:46 -0700)]
Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Dianne Hackborn [Tue, 30 Mar 2010 23:05:05 +0000 (16:05 -0700)]
am
6d630607: am
5cdd7858: Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Merge commit '
6d63060768f9d73c6062a2b603d3c51c7d5f0043' into kraken
* commit '
6d63060768f9d73c6062a2b603d3c51c7d5f0043':
Fix issue #
2553553: API REVIEW: android.context.Context
Dianne Hackborn [Tue, 30 Mar 2010 23:00:41 +0000 (16:00 -0700)]
am
5cdd7858: Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Merge commit '
5cdd78589db7f31c59df2e40146bd761a6570d13' into froyo-plus-aosp
* commit '
5cdd78589db7f31c59df2e40146bd761a6570d13':
Fix issue #
2553553: API REVIEW: android.context.Context
Dianne Hackborn [Tue, 30 Mar 2010 22:55:37 +0000 (15:55 -0700)]
Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo
Andreas Huber [Tue, 30 Mar 2010 22:49:38 +0000 (15:49 -0700)]
am
9cfc52d9: am
99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '
9cfc52d9f99f61c573ad845529265d4fb7a5842c' into kraken
* commit '
9cfc52d9f99f61c573ad845529265d4fb7a5842c':
Properly fill in the component name for the software decoders.
Andreas Huber [Tue, 30 Mar 2010 22:44:23 +0000 (15:44 -0700)]
am
99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
Merge commit '
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc' into froyo-plus-aosp
* commit '
99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc':
Properly fill in the component name for the software decoders.
Andreas Huber [Tue, 30 Mar 2010 22:40:38 +0000 (15:40 -0700)]
Merge "Properly fill in the component name for the software decoders." into froyo
Amith Yamasani [Tue, 30 Mar 2010 22:27:35 +0000 (15:27 -0700)]
am
e1331779: am
95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit '
e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken
* commit '
e133177980b908d183ed8fe46cf3ea33405b8bd5':
Fix for Never not existing in latest timeout values.
Amith Yamasani [Tue, 30 Mar 2010 22:24:51 +0000 (15:24 -0700)]
am
95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo
Merge commit '
95a321fcde17cbb79d89244eee3c1297c449b1a0' into froyo-plus-aosp
* commit '
95a321fcde17cbb79d89244eee3c1297c449b1a0':
Fix for Never not existing in latest timeout values.
Amith Yamasani [Tue, 30 Mar 2010 22:19:00 +0000 (15:19 -0700)]
Merge "Fix for Never not existing in latest timeout values." into froyo
Grace Kloba [Tue, 30 Mar 2010 21:59:19 +0000 (14:59 -0700)]
am
19c1ea3b: am
eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit '
19c1ea3bd05de6f0221b7807053bf03c3cfaaec7' into kraken
* commit '
19c1ea3bd05de6f0221b7807053bf03c3cfaaec7':
Remove the shadow under url bar.
Grace Kloba [Tue, 30 Mar 2010 21:56:14 +0000 (14:56 -0700)]
am
eb643f26: Merge "Remove the shadow under url bar." into froyo
Merge commit '
eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp
* commit '
eb643f2685bd404ef5abb622123cea0aa17939d7':
Remove the shadow under url bar.
Grace Kloba [Tue, 30 Mar 2010 21:51:48 +0000 (14:51 -0700)]
Merge "Remove the shadow under url bar." into froyo
Irfan Sheriff [Tue, 30 Mar 2010 20:55:21 +0000 (13:55 -0700)]
Irfan Sheriff [Tue, 30 Mar 2010 20:51:46 +0000 (13:51 -0700)]
Dianne Hackborn [Tue, 30 Mar 2010 20:42:50 +0000 (13:42 -0700)]
am
ab86fc91: am
de2722af: Merge "Package manager optimizations." into froyo
Merge commit '
ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken
* commit '
ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
Package manager optimizations.
Dianne Hackborn [Tue, 30 Mar 2010 20:40:24 +0000 (13:40 -0700)]
am
de2722af: Merge "Package manager optimizations." into froyo
Merge commit '
de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp
* commit '
de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
Package manager optimizations.
Andreas Huber [Tue, 30 Mar 2010 20:40:11 +0000 (13:40 -0700)]
am
0bca99e9: am
8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo
Merge commit '
0bca99e987420a63ebd509093cbde015399d8522' into kraken
* commit '
0bca99e987420a63ebd509093cbde015399d8522':
Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
Dianne Hackborn [Tue, 30 Mar 2010 20:35:33 +0000 (13:35 -0700)]
Merge "Package manager optimizations." into froyo
Andreas Huber [Tue, 30 Mar 2010 20:34:39 +0000 (13:34 -0700)]
am
8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo
Merge commit '
8899186b60bcbfa783217a0f773e4cd032911f3c' into froyo-plus-aosp
* commit '
8899186b60bcbfa783217a0f773e4cd032911f3c':
Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
Andreas Huber [Tue, 30 Mar 2010 20:31:57 +0000 (13:31 -0700)]
Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available." into froyo
Christopher Tate [Tue, 30 Mar 2010 20:17:23 +0000 (13:17 -0700)]
am
b3f7fe44: am
22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit '
b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c' into kraken
* commit '
b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c':
Make RestoreSession.getAvailableRestoreSets() asynchronous
Christopher Tate [Tue, 30 Mar 2010 20:13:52 +0000 (13:13 -0700)]
am
22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit '
22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp
* commit '
22375e4a736c0d646c3cf0905c15126f7f4107c2':
Make RestoreSession.getAvailableRestoreSets() asynchronous
Christopher Tate [Tue, 30 Mar 2010 20:09:50 +0000 (13:09 -0700)]
Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Daniel Sandler [Tue, 30 Mar 2010 19:56:36 +0000 (12:56 -0700)]
Daniel Sandler [Tue, 30 Mar 2010 19:53:28 +0000 (12:53 -0700)]
Patrick Scott [Tue, 30 Mar 2010 18:49:12 +0000 (11:49 -0700)]
am
7fb1a891: am
ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit '
7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken
* commit '
7fb1a89128a87c30441bc839c935f8e1fb993a26':
Fix a simple logic mistake.
Patrick Scott [Tue, 30 Mar 2010 18:45:55 +0000 (11:45 -0700)]
am
ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit '
ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp
* commit '
ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
Fix a simple logic mistake.
Patrick Scott [Tue, 30 Mar 2010 18:41:29 +0000 (11:41 -0700)]
Merge "Fix a simple logic mistake." into froyo
Jean-Michel Trivi [Tue, 30 Mar 2010 18:23:23 +0000 (11:23 -0700)]
am
38cb6197: am
2a5d9f9b: Fix bug
2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '
38cb619770cf7b4207f464edc4839c79c03ad372' into kraken
* commit '
38cb619770cf7b4207f464edc4839c79c03ad372':
Fix bug
2553592 API REVIEW: android.speech
Jean-Michel Trivi [Tue, 30 Mar 2010 18:20:32 +0000 (11:20 -0700)]
am
2a5d9f9b: Fix bug
2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '
2a5d9f9b577376768372837723f0f42098aba13b' into froyo-plus-aosp
* commit '
2a5d9f9b577376768372837723f0f42098aba13b':
Fix bug
2553592 API REVIEW: android.speech
San Mehat [Tue, 30 Mar 2010 17:46:23 +0000 (10:46 -0700)]
am
b07d6992: (-s ours) am
d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit '
b07d69920199817904ccb9056e3dd56cf736e438' into kraken
* commit '
b07d69920199817904ccb9056e3dd56cf736e438':
framework: Hide StorageManager for froyo - DO NOT MERGE
San Mehat [Tue, 30 Mar 2010 17:39:36 +0000 (10:39 -0700)]
am
d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit '
d4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp
* commit '
d4610977d9217cbd70dd59f61914c74d1ca61036':
framework: Hide StorageManager for froyo - DO NOT MERGE
Jaikumar Ganesh [Tue, 30 Mar 2010 17:36:54 +0000 (10:36 -0700)]
am
77239140: am
0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '
772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken
* commit '
772391402f26f418eee70039e89c0b6a8a9d69eb':
Relax the requirement of making a DBUS call for creating the Bluez Device.
San Mehat [Tue, 30 Mar 2010 17:35:44 +0000 (10:35 -0700)]
Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Jaikumar Ganesh [Tue, 30 Mar 2010 17:30:48 +0000 (10:30 -0700)]
am
0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '
0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp
* commit '
0e09030977aea8b40fd177139528d4b5637c9771':
Relax the requirement of making a DBUS call for creating the Bluez Device.
Kenny Root [Tue, 30 Mar 2010 16:38:14 +0000 (09:38 -0700)]
am
664c7adb: am
7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '
664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken
* commit '
664c7adb1847dd304f36239dc63b4986bf828dc1':
Import revised translations
Kenny Root [Tue, 30 Mar 2010 16:27:15 +0000 (09:27 -0700)]
am
7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '
7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp
* commit '
7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
Import revised translations
Kenny Root [Tue, 30 Mar 2010 16:23:16 +0000 (09:23 -0700)]
Merge "Import revised translations" into froyo
Bjorn Bringert [Tue, 30 Mar 2010 11:06:03 +0000 (04:06 -0700)]
am
3f434566: am
fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit '
3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken
* commit '
3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
Clean up SearchableInfo API, JavaDoc and formatting
Bjorn Bringert [Tue, 30 Mar 2010 10:59:36 +0000 (03:59 -0700)]
am
fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit '
fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp
* commit '
fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
Clean up SearchableInfo API, JavaDoc and formatting
Dianne Hackborn [Tue, 30 Mar 2010 04:23:08 +0000 (21:23 -0700)]
am
e5132805: am
e2522466: Fix issue #
2547337: switching night modes
Merge commit '
e5132805110ba98e301b792cc0c2141b1729b680' into kraken
* commit '
e5132805110ba98e301b792cc0c2141b1729b680':
Fix issue #
2547337: switching night modes
Dianne Hackborn [Tue, 30 Mar 2010 04:23:03 +0000 (21:23 -0700)]
am
2fecae38: am
ad5499dd: Hopefully get rid of some ANRs.
Merge commit '
2fecae386d952197d63fb75f8ec245d87159a684' into kraken
* commit '
2fecae386d952197d63fb75f8ec245d87159a684':
Hopefully get rid of some ANRs.
Dianne Hackborn [Tue, 30 Mar 2010 04:19:39 +0000 (21:19 -0700)]
am
e2522466: Fix issue #
2547337: switching night modes
Merge commit '
e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp
* commit '
e2522466552f9c6b7fcea866709710f53aa1f2a8':
Fix issue #
2547337: switching night modes
Dianne Hackborn [Tue, 30 Mar 2010 04:19:36 +0000 (21:19 -0700)]
am
ad5499dd: Hopefully get rid of some ANRs.
Merge commit '
ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp
* commit '
ad5499dd204a1512471778462a805a288595f2f2':
Hopefully get rid of some ANRs.
Adam Powell [Tue, 30 Mar 2010 04:09:28 +0000 (21:09 -0700)]
Adam Powell [Tue, 30 Mar 2010 04:02:47 +0000 (21:02 -0700)]
am
9d32d24d: Remove overscrolling
Merge commit '
9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp
* commit '
9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
Remove overscrolling
Oscar Montemayor [Tue, 30 Mar 2010 02:03:28 +0000 (19:03 -0700)]
am
1ec71365: (-s ours) am
f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#
2502219." into froyo
Merge commit '
1ec71365f98baa24f8df82d9c4a79dd6edc940eb' into kraken
* commit '
1ec71365f98baa24f8df82d9c4a79dd6edc940eb':
DO NOT MERGE
Oscar Montemayor [Tue, 30 Mar 2010 02:01:16 +0000 (19:01 -0700)]
am
f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#
2502219." into froyo
Merge commit '
f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp
* commit '
f5f300678abb79574bb56eee13c8dd2b7b98b740':
DO NOT MERGE
Oscar Montemayor [Tue, 30 Mar 2010 01:56:57 +0000 (18:56 -0700)]
Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#
2502219." into froyo
Charles Chen [Tue, 30 Mar 2010 01:44:59 +0000 (18:44 -0700)]
am
629d03f1: am
a599dafe: Merge "Fix for bug
2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Merge commit '
629d03f12251220daf26abc5be86d4649318a331' into kraken
* commit '
629d03f12251220daf26abc5be86d4649318a331':
Fix for bug
2548048 - it was impossible for applications to discover
Charles Chen [Tue, 30 Mar 2010 01:41:48 +0000 (18:41 -0700)]
am
a599dafe: Merge "Fix for bug
2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Merge commit '
a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp
* commit '
a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
Fix for bug
2548048 - it was impossible for applications to discover
Charles Chen [Tue, 30 Mar 2010 01:37:41 +0000 (18:37 -0700)]
Merge "Fix for bug
2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Amith Yamasani [Tue, 30 Mar 2010 01:33:55 +0000 (18:33 -0700)]
am
e7eb3a35: am
8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Merge commit '
e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken
* commit '
e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
Fix preloaded classes for API rename of BackupAgentHelper
Amith Yamasani [Tue, 30 Mar 2010 01:28:14 +0000 (18:28 -0700)]
am
8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Merge commit '
8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp
* commit '
8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
Fix preloaded classes for API rename of BackupAgentHelper
Amith Yamasani [Tue, 30 Mar 2010 01:24:59 +0000 (18:24 -0700)]
Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Joe Onorato [Tue, 30 Mar 2010 01:13:38 +0000 (18:13 -0700)]
Oscar Montemayor [Sat, 27 Mar 2010 01:44:14 +0000 (18:44 -0700)]
DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#
2502219.
Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
Joe Onorato [Tue, 30 Mar 2010 01:10:09 +0000 (18:10 -0700)]
Romain Guy [Mon, 29 Mar 2010 23:40:43 +0000 (16:40 -0700)]
am
1faae167: am
691b806f: Merge "Fix possible security issue. Bug #
2553187" into froyo
Merge commit '
1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken
* commit '
1faae1677229bf9a4552cc3f90e0afe2858e7a4c':
Fix possible security issue.
Romain Guy [Mon, 29 Mar 2010 23:34:46 +0000 (16:34 -0700)]
am
691b806f: Merge "Fix possible security issue. Bug #
2553187" into froyo
Merge commit '
691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp
* commit '
691b806ff8b4a6428588e8495cb1a5819a0aee99':
Fix possible security issue.
Ben Cheng [Mon, 29 Mar 2010 23:32:11 +0000 (16:32 -0700)]
am
8d0dc62f: am
ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit '
8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken
* commit '
8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Steve Howard [Mon, 29 Mar 2010 23:32:05 +0000 (16:32 -0700)]
am
e9cd68f1: am
8deb2391: Merge "Remove upside-down portrait orientation." into froyo
Merge commit '
e9cd68f18197bd4417a6fd4534979c4807568ecc' into kraken
* commit '
e9cd68f18197bd4417a6fd4534979c4807568ecc':
Remove upside-down portrait orientation.
Romain Guy [Mon, 29 Mar 2010 23:31:14 +0000 (16:31 -0700)]
Merge "Fix possible security issue. Bug #
2553187" into froyo
Ben Cheng [Mon, 29 Mar 2010 23:25:13 +0000 (16:25 -0700)]
am
ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit '
ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp
* commit '
ef3f5ddc2137ed99e41f00441b688fb56b855179':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Steve Howard [Mon, 29 Mar 2010 23:25:09 +0000 (16:25 -0700)]
am
8deb2391: Merge "Remove upside-down portrait orientation." into froyo
Merge commit '
8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp
* commit '
8deb239169f9b60cf19b6f4293978e654fa15a03':
Remove upside-down portrait orientation.
Steve Howard [Mon, 29 Mar 2010 23:05:35 +0000 (16:05 -0700)]
Merge "Remove upside-down portrait orientation." into froyo
Christopher Tate [Mon, 29 Mar 2010 22:57:01 +0000 (15:57 -0700)]
am
245df5ad: am
3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Merge commit '
245df5ad16ff227761906c10dc97c01901232666' into kraken
* commit '
245df5ad16ff227761906c10dc97c01901232666':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Mathias Agopian [Mon, 29 Mar 2010 22:56:57 +0000 (15:56 -0700)]
am
0815235f: am
a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
Merge commit '
0815235ffceb9e079185c1a3c78e2793157523f9' into kraken
* commit '
0815235ffceb9e079185c1a3c78e2793157523f9':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
Mathias Agopian [Mon, 29 Mar 2010 22:56:54 +0000 (15:56 -0700)]
am
6874362a: am
04fdd180: Merge "fix [
2542425] memory leak during video recording" into froyo
Merge commit '
6874362a6b3e0b75f42a2d1bf266eb2d25580b47' into kraken
* commit '
6874362a6b3e0b75f42a2d1bf266eb2d25580b47':
fix [
2542425] memory leak during video recording
Christopher Tate [Mon, 29 Mar 2010 22:53:54 +0000 (15:53 -0700)]
am
3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Merge commit '
3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp
* commit '
3f264c4fba416f55247da3fafd6afbe55bf93598':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Mathias Agopian [Mon, 29 Mar 2010 22:53:48 +0000 (15:53 -0700)]
am
a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
Merge commit '
a019df875d991ce61c93720f37c036655723f5f6' into froyo-plus-aosp
* commit '
a019df875d991ce61c93720f37c036655723f5f6':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
Mathias Agopian [Mon, 29 Mar 2010 22:53:44 +0000 (15:53 -0700)]
am
04fdd180: Merge "fix [
2542425] memory leak during video recording" into froyo
Merge commit '
04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp
* commit '
04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
fix [
2542425] memory leak during video recording
Christopher Tate [Mon, 29 Mar 2010 22:50:57 +0000 (15:50 -0700)]
Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:44:48 +0000 (15:44 -0700)]
Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:44:33 +0000 (15:44 -0700)]
Merge "fix [
2542425] memory leak during video recording" into froyo
Dirk Dougherty [Mon, 29 Mar 2010 22:43:23 +0000 (15:43 -0700)]
am
6c754559: am
c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Merge commit '
6c75455908579c1bd48777847c0861967bc413a9' into kraken
* commit '
6c75455908579c1bd48777847c0861967bc413a9':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Andreas Huber [Mon, 29 Mar 2010 22:43:19 +0000 (15:43 -0700)]
am
538c310b: am
02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Merge commit '
538c310b091a6cc74020423deed9d62703f3f13f' into kraken
* commit '
538c310b091a6cc74020423deed9d62703f3f13f':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
Dirk Dougherty [Mon, 29 Mar 2010 22:39:56 +0000 (15:39 -0700)]
am
c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Merge commit '
c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp
* commit '
c46f28dc0fde1889b37bdc7066ec2af96c16e358':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Andreas Huber [Mon, 29 Mar 2010 22:39:53 +0000 (15:39 -0700)]
am
02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Merge commit '
02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp
* commit '
02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
Dirk Dougherty [Mon, 29 Mar 2010 22:36:53 +0000 (15:36 -0700)]
Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Andreas Huber [Mon, 29 Mar 2010 22:16:20 +0000 (15:16 -0700)]
Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Jim Miller [Mon, 29 Mar 2010 22:14:27 +0000 (15:14 -0700)]
am
d41d4586: am
c6dc5070: Merge "Fix
2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Merge commit '
d41d458696b2ab54387dd0683a3365e788b97c2d' into kraken
* commit '
d41d458696b2ab54387dd0683a3365e788b97c2d':
Fix
2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
Mathias Agopian [Mon, 29 Mar 2010 22:12:19 +0000 (15:12 -0700)]
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.
Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
Jim Miller [Mon, 29 Mar 2010 22:11:01 +0000 (15:11 -0700)]
am
c6dc5070: Merge "Fix
2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Merge commit '
c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp
* commit '
c6dc5070ef663e514add038b1d2e78761156b0c0':
Fix
2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
Romain Guy [Mon, 29 Mar 2010 22:10:43 +0000 (15:10 -0700)]
Jim Miller [Mon, 29 Mar 2010 22:07:06 +0000 (15:07 -0700)]
Merge "Fix
2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Romain Guy [Mon, 29 Mar 2010 22:05:11 +0000 (15:05 -0700)]
am
21ad6043: am
6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #
2553515 #
2553595
Merge commit '
21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f' into kraken
* commit '
21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f':
Rename tab widget attributes, remove scroll barrier constant.
Romain Guy [Mon, 29 Mar 2010 22:05:05 +0000 (15:05 -0700)]
Romain Guy [Mon, 29 Mar 2010 21:49:09 +0000 (14:49 -0700)]
am
6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #
2553515 #
2553595
Merge commit '
6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp
* commit '
6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
Rename tab widget attributes, remove scroll barrier constant.