OSDN Git Service
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: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: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: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: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
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: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.
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: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: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
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
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: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: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: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.
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: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: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:07:37 +0000 (12:07 -0700)]
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:04:30 +0000 (11:04 -0700)]
merge from open-source master
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
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: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:05:28 +0000 (10:05 -0700)]
Merge "Implement audio focus support in the notification manager." into froyo
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:30:40 +0000 (17:30 -0700)]
Merge "Don't assume there's a selected position in touch mode. Bug #
2520743" into froyo
Dirk Dougherty [Fri, 26 Mar 2010 23:27:07 +0000 (16:27 -0700)]
Merge "Cherry-pick
97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo
Jean-Michel Trivi [Fri, 26 Mar 2010 23:17:38 +0000 (16:17 -0700)]
Merge "Cherry-picking this fix into Froyo." into froyo
Grace Kloba [Fri, 26 Mar 2010 22:30:26 +0000 (15:30 -0700)]
Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo
Grace Kloba [Fri, 26 Mar 2010 20:55:34 +0000 (13:55 -0700)]
Merge "cherry-picked
bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo
Jean-Baptiste Queru [Fri, 26 Mar 2010 19:25:11 +0000 (12:25 -0700)]
Merge "Hide download manager." into froyo
Joe Onorato [Fri, 26 Mar 2010 19:14:49 +0000 (12:14 -0700)]
Merge "Fix StatusBarService deadlock for real this time." into froyo
Daniel Sandler [Fri, 26 Mar 2010 18:41:34 +0000 (11:41 -0700)]
Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
Brad Fitzpatrick [Fri, 26 Mar 2010 04:02:46 +0000 (21:02 -0700)]
Merge "Clarify some Binder docs regarding things that are thread-local."
Mathias Agopian [Fri, 26 Mar 2010 03:22:58 +0000 (20:22 -0700)]
Merge "fix [
2236865] STOPSHIP: bump soft gl and egl minor version number"
Mathias Agopian [Fri, 26 Mar 2010 03:21:12 +0000 (20:21 -0700)]
fix [
2236865] STOPSHIP: bump soft gl and egl minor version number
this is to allow developpers to deal with potiential differences
between the softgl versions.
Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
Jim Miller [Fri, 26 Mar 2010 02:54:15 +0000 (19:54 -0700)]
Merge "Fix
2535700: Add support for enforcing password quality"
Dianne Hackborn [Fri, 26 Mar 2010 02:23:09 +0000 (19:23 -0700)]
Merge "Fix Memory Leak When Switching Input Methods"
Marco Nelissen [Fri, 26 Mar 2010 02:06:23 +0000 (19:06 -0700)]
Merge "Remove spurious byte order marks from xml files."
Adam Powell [Fri, 26 Mar 2010 01:55:47 +0000 (18:55 -0700)]
Merge "Fix bug
2544916 - Fun with AbsListView touch mode"
Mathias Agopian [Fri, 26 Mar 2010 01:42:34 +0000 (18:42 -0700)]
Merge "fix [
2545826] calling into gralloc with external lock held"
Dan Egnor [Fri, 26 Mar 2010 00:59:00 +0000 (17:59 -0700)]
Merge "Add "dumpsys diskstats" to get a dump of disk-free values."
Jack Palevich [Fri, 26 Mar 2010 00:21:50 +0000 (17:21 -0700)]
Merge "GLSurfaceView pause and resume now synchronize with the GLThread."
Adam Powell [Fri, 26 Mar 2010 00:03:58 +0000 (17:03 -0700)]
Merge "API refactoring for OverScroller."
The Android Open Source Project [Thu, 25 Mar 2010 23:39:32 +0000 (16:39 -0700)]
merge from open-source master
Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e
Joe Onorato [Thu, 25 Mar 2010 23:00:25 +0000 (16:00 -0700)]
Merge "Fix
2495749 - System process crash when a notification switches sections."
Robert Greenwalt [Thu, 25 Mar 2010 22:50:25 +0000 (15:50 -0700)]
Merge "Fix Tethering of multiple downstream ifaces."
Fred Quintana [Thu, 25 Mar 2010 21:39:15 +0000 (14:39 -0700)]
Merge "check for nulls"
Mathias Agopian [Thu, 25 Mar 2010 21:34:49 +0000 (14:34 -0700)]
fix [
2545826] calling into gralloc with external lock held
Change-Id: I2d0e017382404c684c768a0dd0423d574213f10a
Patrick Scott [Thu, 25 Mar 2010 20:27:57 +0000 (13:27 -0700)]
Merge "Add .3gpp as the preferred extension for video/3gpp."
Daniel Sandler [Thu, 25 Mar 2010 20:26:36 +0000 (13:26 -0700)]
Merge "Use a more benign icon for ADB notifications."
Brad Fitzpatrick [Thu, 25 Mar 2010 20:22:15 +0000 (13:22 -0700)]
Merge "Better fix for gettid() sim-eng breakage from last night."
Jean-Baptiste Queru [Thu, 25 Mar 2010 19:35:22 +0000 (12:35 -0700)]
Merge "Hide download manager."
Dianne Hackborn [Thu, 25 Mar 2010 19:32:12 +0000 (12:32 -0700)]
Merge "Dumb late-night typo."
Joe Onorato [Thu, 25 Mar 2010 18:54:12 +0000 (11:54 -0700)]
Merge "Add window flags and window types to hierarchyviewer."
Jack Palevich [Thu, 25 Mar 2010 18:54:10 +0000 (11:54 -0700)]
Merge "Turn off thread logging (too many messages.)"
Neal Nguyen [Thu, 25 Mar 2010 18:09:38 +0000 (11:09 -0700)]
Merge "Refactoring PackageManagerHostTests helper functions into a utility class for easier sharing with future stress tests."
Mike Reed [Thu, 25 Mar 2010 18:04:02 +0000 (11:04 -0700)]
Merge "update dox that we ignore the exact parameter on computeBounds"
Jack Palevich [Thu, 25 Mar 2010 17:53:10 +0000 (10:53 -0700)]
Merge "Add logging of GLSurfaceView pause/resume calls."
Grace Kloba [Thu, 25 Mar 2010 17:32:22 +0000 (10:32 -0700)]
Merge "Turn on plugin signature checking."
San Mehat [Thu, 25 Mar 2010 17:20:44 +0000 (10:20 -0700)]
Merge "MountService: Switch all Log -> Slog"
Chih-Chung Chang [Thu, 25 Mar 2010 17:05:58 +0000 (10:05 -0700)]
Merge "Call unlinkToDeath() when we disconnect the Camera, so we don't hold the (weak) reference to it, which caused (small) memory leaks."
Nick Pelly [Thu, 25 Mar 2010 17:01:21 +0000 (10:01 -0700)]
Merge "Fix Phone App crash due to binary data in HSP/HFP stream."
Dave Sparks [Thu, 25 Mar 2010 15:24:24 +0000 (08:24 -0700)]
Merge "New lock/unlock sounds."
Leon Clarke [Thu, 25 Mar 2010 14:38:22 +0000 (07:38 -0700)]
Merge "b/issue?id=
2516676 Correctly scale the play button and youtube logo when embedded youtube videos are displayed at smaller than the suggested size."
Bjorn Bringert [Thu, 25 Mar 2010 14:36:46 +0000 (07:36 -0700)]
Merge "Use a secure setting for default browser geolocation permissions"
Wu-cheng Li [Thu, 25 Mar 2010 10:52:00 +0000 (03:52 -0700)]
Merge "Fix testCameraPreviewMemoryUsage test."
Brad Fitzpatrick [Thu, 25 Mar 2010 09:05:31 +0000 (02:05 -0700)]
Merge "Hopefully fix the sim-eng build, part 2."
Dianne Hackborn [Thu, 25 Mar 2010 08:02:32 +0000 (01:02 -0700)]
Merge "Fix issue #
2543231: chat invitation dialog does show all the time"
Amith Yamasani [Thu, 25 Mar 2010 05:26:10 +0000 (22:26 -0700)]
Merge "Fix
2242164 Soft keyboard keeps getting enabled even if I disable it"
Jeff Brown [Thu, 25 Mar 2010 03:06:41 +0000 (20:06 -0700)]
Merge "Ensure Binder finalizer handles partially initialized instances."
Grace Kloba [Thu, 25 Mar 2010 01:27:18 +0000 (18:27 -0700)]
Merge "There are two computeHorizontalScrollRange() got missed in the last conversion."