Daniel Sandler
8853a82607
am 454a956b: am a7035909: Remove logspew.
...
Merge commit '454a956b52884083e3436fe2ea7e478df2bcbeea' into kraken
* commit '454a956b52884083e3436fe2ea7e478df2bcbeea':
Remove logspew.
2010-03-30 12:56:36 -07:00
Daniel Sandler
2b1545b216
am a7035909: Remove logspew.
...
Merge commit 'a7035909453c9980a5f8547f5090c70c4281156c' into froyo-plus-aosp
* commit 'a7035909453c9980a5f8547f5090c70c4281156c':
Remove logspew.
2010-03-30 12:53:28 -07:00
Patrick Scott
a3762b480d
am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo
...
Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken
* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
Fix a simple logic mistake.
2010-03-30 11:49:12 -07:00
Patrick Scott
2943c181a4
am ae405d56: Merge "Fix a simple logic mistake." into froyo
...
Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp
* commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
Fix a simple logic mistake.
2010-03-30 11:45:55 -07:00
Patrick Scott
85cf79e0df
Merge "Fix a simple logic mistake." into froyo
2010-03-30 11:41:29 -07:00
Jean-Michel Trivi
a9765095bc
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
2010-03-30 11:23:23 -07:00
Jean-Michel Trivi
ad136f611c
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
2010-03-30 11:20:32 -07:00
San Mehat
6a0dedd7b2
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
2010-03-30 10:46:23 -07:00
San Mehat
07cdc8a5d8
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
2010-03-30 10:39:36 -07:00
Jaikumar Ganesh
ca0b6cf8b5
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.
2010-03-30 10:36:54 -07:00
San Mehat
e3b8bab8f7
Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
2010-03-30 10:35:44 -07:00
Jaikumar Ganesh
560bc8af03
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.
2010-03-30 10:30:48 -07:00
Kenny Root
6c78c69bf8
am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo
...
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken
* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
Import revised translations
2010-03-30 09:38:14 -07:00
Kenny Root
1efb57f8cc
am 7a17f0c0: Merge "Import revised translations" into froyo
...
Merge commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp
* commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
Import revised translations
2010-03-30 09:27:15 -07:00
Kenny Root
857f556c02
Merge "Import revised translations" into froyo
2010-03-30 09:23:16 -07:00
Bjorn Bringert
72e0af4430
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
2010-03-30 04:06:03 -07:00
Bjorn Bringert
0c75c21dc6
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
2010-03-30 03:59:36 -07:00
Dianne Hackborn
dcc6fc4d61
am e5132805: am e2522466: Fix issue #2547337 : switching night modes
...
Merge commit 'e5132805110ba98e301b792cc0c2141b1729b680' into kraken
* commit 'e5132805110ba98e301b792cc0c2141b1729b680':
Fix issue #2547337 : switching night modes
2010-03-29 21:23:08 -07:00
Dianne Hackborn
87d04bf34f
am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs.
...
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken
* commit '2fecae386d952197d63fb75f8ec245d87159a684':
Hopefully get rid of some ANRs.
2010-03-29 21:23:03 -07:00
Dianne Hackborn
041c512c14
am e2522466: Fix issue #2547337 : switching night modes
...
Merge commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp
* commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8':
Fix issue #2547337 : switching night modes
2010-03-29 21:19:39 -07:00
Dianne Hackborn
46f86aa4d5
am ad5499dd: Hopefully get rid of some ANRs.
...
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp
* commit 'ad5499dd204a1512471778462a805a288595f2f2':
Hopefully get rid of some ANRs.
2010-03-29 21:19:36 -07:00
Adam Powell
81dc6c1514
am 370fe2a9: am 9d32d24d: Remove overscrolling
...
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken
* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
Remove overscrolling
2010-03-29 21:09:28 -07:00
Adam Powell
33e232955d
am 9d32d24d: Remove overscrolling
...
Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp
* commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
Remove overscrolling
2010-03-29 21:02:47 -07:00
Oscar Montemayor
ec41806007
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
2010-03-29 19:03:28 -07:00
Oscar Montemayor
fe6015b4f6
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
2010-03-29 19:01:16 -07:00
Oscar Montemayor
0e23025c0d
Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
2010-03-29 18:56:57 -07:00
Charles Chen
5b0d92c50c
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
2010-03-29 18:44:59 -07:00
Charles Chen
88cef743df
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
2010-03-29 18:41:48 -07:00
Charles Chen
a9bdac378b
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
2010-03-29 18:37:41 -07:00
Amith Yamasani
2a6304d7c1
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
2010-03-29 18:33:55 -07:00
Amith Yamasani
2bfddb7f6f
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
2010-03-29 18:28:14 -07:00
Amith Yamasani
c5363eb4ef
Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
2010-03-29 18:24:59 -07:00
Joe Onorato
91aa99f169
am 82bac8ec: am 59fc58dc: fix the build
...
Merge commit '82bac8ece4d0e07f0490c9852b295f465acd1dee' into kraken
* commit '82bac8ece4d0e07f0490c9852b295f465acd1dee':
fix the build
2010-03-29 18:13:38 -07:00
Oscar Montemayor
e0cec3cea1
DO NOT MERGE
...
Removing unused features from source tree.
Please refer to Bug#2502219.
Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
2010-03-29 18:12:24 -07:00
Joe Onorato
90137726d3
am 59fc58dc: fix the build
...
Merge commit '59fc58dc3f164e33a96aee09505fac5818747cb6' into froyo-plus-aosp
* commit '59fc58dc3f164e33a96aee09505fac5818747cb6':
fix the build
2010-03-29 18:10:09 -07:00
Romain Guy
c83c4a2520
am 1faae167: am 691b806f: Merge "Fix possible security issue. Bug #2553187 " into froyo
...
Merge commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c' into kraken
* commit '1faae1677229bf9a4552cc3f90e0afe2858e7a4c':
Fix possible security issue.
2010-03-29 16:40:43 -07:00
Romain Guy
bf63f52f42
am 691b806f: Merge "Fix possible security issue. Bug #2553187 " into froyo
...
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp
* commit '691b806ff8b4a6428588e8495cb1a5819a0aee99':
Fix possible security issue.
2010-03-29 16:34:46 -07:00
Ben Cheng
d20f3927eb
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.
2010-03-29 16:32:11 -07:00
Steve Howard
f940c77519
am e9cd68f1: am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo
...
Merge commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc' into kraken
* commit 'e9cd68f18197bd4417a6fd4534979c4807568ecc':
Remove upside-down portrait orientation.
2010-03-29 16:32:05 -07:00
Romain Guy
77d90c3917
Merge "Fix possible security issue. Bug #2553187 " into froyo
2010-03-29 16:31:14 -07:00
Ben Cheng
464e8c3ac2
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.
2010-03-29 16:25:13 -07:00
Steve Howard
9a2697b08e
am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo
...
Merge commit '8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp
* commit '8deb239169f9b60cf19b6f4293978e654fa15a03':
Remove upside-down portrait orientation.
2010-03-29 16:25:09 -07:00
Steve Howard
c088fd6a70
Merge "Remove upside-down portrait orientation." into froyo
2010-03-29 16:05:35 -07:00
Christopher Tate
6891b43080
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
2010-03-29 15:57:01 -07:00
Mathias Agopian
c1b97129ce
am 0815235f: am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
...
Merge commit '0815235ffceb9e079185c1a3c78e2793157523f9' into kraken
* commit '0815235ffceb9e079185c1a3c78e2793157523f9':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
2010-03-29 15:56:57 -07:00
Mathias Agopian
de85182970
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
2010-03-29 15:56:54 -07:00
Christopher Tate
200c9ee58b
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
2010-03-29 15:53:54 -07:00
Mathias Agopian
70ffeb9849
am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
...
Merge commit 'a019df875d991ce61c93720f37c036655723f5f6' into froyo-plus-aosp
* commit 'a019df875d991ce61c93720f37c036655723f5f6':
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
2010-03-29 15:53:48 -07:00
Mathias Agopian
473068e0de
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
2010-03-29 15:53:44 -07:00
Christopher Tate
094c65d083
Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
2010-03-29 15:50:57 -07:00