OSDN Git Service
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.
Doug Zongker [Mon, 29 Mar 2010 21:05:01 +0000 (14:05 -0700)]
am
0d531f5b: am
ab69e29c: relocate android.util.base64.* -> android.util.*
Merge commit '
0d531f5b5927556fd94e44eedacb678f6341479b' into kraken
* commit '
0d531f5b5927556fd94e44eedacb678f6341479b':
relocate android.util.base64.* -> android.util.*
Romain Guy [Mon, 29 Mar 2010 21:04:58 +0000 (14:04 -0700)]
am
e16741b2: am
272b504e: Merge "Tame the monkey. Bug #
2547546" into froyo
Merge commit '
e16741b22a55289bd22787b91842b410213556f6' into kraken
* commit '
e16741b22a55289bd22787b91842b410213556f6':
Tame the monkey.
Dirk Dougherty [Mon, 29 Mar 2010 21:04:55 +0000 (14:04 -0700)]
am
9d59c70a: am
12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Merge commit '
9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b' into kraken
* commit '
9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b':
doc change: Indicate that only the first 8 characters of the key alias are used.
Doug Zongker [Mon, 29 Mar 2010 21:00:58 +0000 (14:00 -0700)]
am
ab69e29c: relocate android.util.base64.* -> android.util.*
Merge commit '
ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp
* commit '
ab69e29c1927bdc6143324eba5ccd78f7c43128d':
relocate android.util.base64.* -> android.util.*
Mathias Agopian [Mon, 29 Mar 2010 20:45:18 +0000 (13:45 -0700)]
fix [
2542425] memory leak during video recording
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.
Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
Romain Guy [Mon, 29 Mar 2010 20:06:20 +0000 (13:06 -0700)]
am
272b504e: Merge "Tame the monkey. Bug #
2547546" into froyo
Merge commit '
272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp
* commit '
272b504ee6aaf2515572520cd642f9a4fbf81a44':
Tame the monkey.
Dirk Dougherty [Mon, 29 Mar 2010 20:06:17 +0000 (13:06 -0700)]
am
12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Merge commit '
12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp
* commit '
12cd8a3c27aac27832d42f559afeebf0d95f14d3':
doc change: Indicate that only the first 8 characters of the key alias are used.
Andreas Huber [Mon, 29 Mar 2010 20:06:11 +0000 (13:06 -0700)]
am
8ccfd36d: am
1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into
Merge commit '
8ccfd36d3d6aae7be33dcf0c19646762298306ad' into kraken
* commit '
8ccfd36d3d6aae7be33dcf0c19646762298306ad':
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
Andreas Huber [Mon, 29 Mar 2010 20:01:27 +0000 (13:01 -0700)]
am
1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
Merge commit '
1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp
* commit '
1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
Jean-Baptiste Queru [Mon, 29 Mar 2010 20:01:26 +0000 (13:01 -0700)]
Romain Guy [Mon, 29 Mar 2010 20:00:42 +0000 (13:00 -0700)]
Merge "Tame the monkey. Bug #
2547546" into froyo
Dirk Dougherty [Mon, 29 Mar 2010 20:00:37 +0000 (13:00 -0700)]
Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Andreas Huber [Mon, 29 Mar 2010 19:58:03 +0000 (12:58 -0700)]
Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
Romain Guy [Mon, 29 Mar 2010 19:37:48 +0000 (12:37 -0700)]
am
7e31b282: am
0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '
7e31b282ddd1f4296ba702f7604044216a95f65e' into kraken
* commit '
7e31b282ddd1f4296ba702f7604044216a95f65e':
Rename private fields to break bad code examples
Romain Guy [Mon, 29 Mar 2010 19:34:23 +0000 (12:34 -0700)]
am
0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '
0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp
* commit '
0e1229260d66b308a0ad271c20970e3decd6f55c':
Rename private fields to break bad code examples
Romain Guy [Mon, 29 Mar 2010 19:28:20 +0000 (12:28 -0700)]
Merge "Rename private fields to break bad code examples" into froyo
Jack Palevich [Mon, 29 Mar 2010 19:24:48 +0000 (12:24 -0700)]
am
cdb9839a: am
5d961085: Add a test of EGL pausing and resuming.
Merge commit '
cdb9839a569819f233c6d0d9658ffa1fab938794' into kraken
* commit '
cdb9839a569819f233c6d0d9658ffa1fab938794':
Add a test of EGL pausing and resuming.
Jack Palevich [Mon, 29 Mar 2010 19:22:08 +0000 (12:22 -0700)]
am
5d961085: Add a test of EGL pausing and resuming.
Merge commit '
5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp
* commit '
5d961085c33d17e43330ed2d3ada03ffcfa04817':
Add a test of EGL pausing and resuming.
Jack Palevich [Mon, 29 Mar 2010 19:09:57 +0000 (12:09 -0700)]
Add a test of EGL pausing and resuming.
Irfan Sheriff [Mon, 29 Mar 2010 19:12:48 +0000 (12:12 -0700)]
Irfan Sheriff [Mon, 29 Mar 2010 19:07:37 +0000 (12:07 -0700)]
Romain Guy [Mon, 29 Mar 2010 18:32:53 +0000 (11:32 -0700)]
am
1889f40a: am
ab924c90: Merge "Make EditTextPreference scrollable. Bug #
2549257" into froyo
Merge commit '
1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken
* commit '
1889f40aa17bd658df1b7181d091a6dff631ec95':
Make EditTextPreference scrollable.
Romain Guy [Mon, 29 Mar 2010 18:28:07 +0000 (11:28 -0700)]
am
ab924c90: Merge "Make EditTextPreference scrollable. Bug #
2549257" into froyo
Merge commit '
ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp
* commit '
ab924c909a516eb71fef7c238a20c7755f8170ed':
Make EditTextPreference scrollable.
Romain Guy [Mon, 29 Mar 2010 18:24:31 +0000 (11:24 -0700)]
Merge "Make EditTextPreference scrollable. Bug #
2549257" into froyo
The Android Open Source Project [Mon, 29 Mar 2010 18:10:32 +0000 (11:10 -0700)]
am
5849606d: merge from open-source master
Merge commit '
5849606df71fb3d5ce88b966cff8382deccd56b6' into kraken
* commit '
5849606df71fb3d5ce88b966cff8382deccd56b6':
Fix typos in comment.
CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
The Android Open Source Project [Mon, 29 Mar 2010 18:04:30 +0000 (11:04 -0700)]
merge from open-source master
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
The Android Open Source Project [Mon, 29 Mar 2010 18:03:33 +0000 (11:03 -0700)]
am
c89704a7: merge from open-source master
Merge commit '
c89704a77f9c51ebd8c1cc6863e15ff402a56c86' into kraken
* commit '
c89704a77f9c51ebd8c1cc6863e15ff402a56c86':
Fix Memory Leak When Switching Input Methods
The Android Open Source Project [Mon, 29 Mar 2010 17:57:04 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
Daniel Lehmann [Mon, 29 Mar 2010 17:37:41 +0000 (10:37 -0700)]
am
3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:
2542703 Bug:
2549485" into froyo
Merge commit '
3e9032e646c898a725c256c90031494cc349eea0' into kraken
* commit '
3e9032e646c898a725c256c90031494cc349eea0':
Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
Daniel Lehmann [Mon, 29 Mar 2010 17:30:54 +0000 (10:30 -0700)]
Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:
2542703 Bug:
2549485" into froyo
Jean-Michel Trivi [Mon, 29 Mar 2010 17:14:28 +0000 (10:14 -0700)]
am
0737d77a: Merge "Implement audio focus support in the notification manager." into froyo
Merge commit '
0737d77ac3964e4db8218ca61a1eaaae31a74f1c' into kraken
* commit '
0737d77ac3964e4db8218ca61a1eaaae31a74f1c':
Implement audio focus support in the notification manager.
Jean-Michel Trivi [Mon, 29 Mar 2010 17:05:28 +0000 (10:05 -0700)]
Merge "Implement audio focus support in the notification manager." into froyo
Grace Kloba [Mon, 29 Mar 2010 16:44:05 +0000 (09:44 -0700)]
Leon Clarke [Mon, 29 Mar 2010 16:10:58 +0000 (09:10 -0700)]
am
7c3006f5: b/issue?id=
2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is destroyed.
Merge commit '
7c3006f53ac02adeac7396726cdc0bf5d6d01926' into kraken
* commit '
7c3006f53ac02adeac7396726cdc0bf5d6d01926':
http://b/issue?id=
2496591
Wu-cheng Li [Mon, 29 Mar 2010 09:08:09 +0000 (02:08 -0700)]
am
0ca25191: Add some comments for zoom methods.
Merge commit '
0ca25191c663ef229f1f475b17899f2017ed6980' into kraken
* commit '
0ca25191c663ef229f1f475b17899f2017ed6980':
Add some comments for zoom methods.
Jack Palevich [Sat, 27 Mar 2010 22:12:31 +0000 (15:12 -0700)]
Dirk Dougherty [Sat, 27 Mar 2010 20:08:53 +0000 (13:08 -0700)]
Dianne Hackborn [Sat, 27 Mar 2010 20:08:50 +0000 (13:08 -0700)]
am
4c8a63ca: Merge "Fix issue #
2538228: Intents targeting browsers constantly nagging" into froyo
Merge commit '
4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7' into kraken
* commit '
4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7':
Fix issue #
2538228: Intents targeting browsers constantly nagging
Dirk Dougherty [Sat, 27 Mar 2010 20:08:48 +0000 (13:08 -0700)]
Dirk Dougherty [Sat, 27 Mar 2010 20:08:44 +0000 (13:08 -0700)]
Dirk Dougherty [Sat, 27 Mar 2010 01:25:05 +0000 (18:25 -0700)]
Merge "cherry-pick
7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo
Dianne Hackborn [Sat, 27 Mar 2010 01:06:52 +0000 (18:06 -0700)]
Merge "Fix issue #
2538228: Intents targeting browsers constantly nagging" into froyo
Dirk Dougherty [Sat, 27 Mar 2010 00:50:26 +0000 (17:50 -0700)]
Merge "cherry-pick
af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo
Romain Guy [Sat, 27 Mar 2010 00:37:08 +0000 (17:37 -0700)]
am
213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug #
2520743" into froyo
Merge commit '
213b9805e31ae9de26c740c04e04af2090759e52' into kraken
* commit '
213b9805e31ae9de26c740c04e04af2090759e52':
Don't assume there's a selected position in touch mode.
Romain Guy [Sat, 27 Mar 2010 00:30:40 +0000 (17:30 -0700)]
Merge "Don't assume there's a selected position in touch mode. Bug #
2520743" into froyo
Dirk Dougherty [Sat, 27 Mar 2010 00:02:28 +0000 (17:02 -0700)]
OSDN Git Service
