OSDN Git Service
Sean McNeil [Wed, 23 Jun 2010 09:00:37 +0000 (16:00 +0700)]
Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.
Change-Id: I489cc453bdce7cb376102cba67a9ea470e13292d
Jean-Baptiste Queru [Fri, 20 Aug 2010 23:21:11 +0000 (16:21 -0700)]
Merge "add new sensor types for handling gyro data and device orientation more efficiently."
Jean-Baptiste Queru [Fri, 20 Aug 2010 22:22:33 +0000 (15:22 -0700)]
Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS."
Jean-Baptiste Queru [Tue, 17 Aug 2010 14:49:54 +0000 (07:49 -0700)]
Merge "Keep track of remaining fd when devices are removed"
Jean-Baptiste Queru [Tue, 17 Aug 2010 14:35:08 +0000 (07:35 -0700)]
Merge "Make the LED colors when charging customizable by the vendor"
Jean-Baptiste Queru [Mon, 16 Aug 2010 19:07:26 +0000 (12:07 -0700)]
Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""
Jean-Baptiste Queru [Mon, 16 Aug 2010 16:15:17 +0000 (09:15 -0700)]
Merge "bootanimation: Don't open non-existing bootanimation.zip"
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:57:29 +0000 (08:57 -0700)]
Merge "frameworks/base/opengl: Add NULL check"
John Huang [Thu, 12 Aug 2010 17:07:06 +0000 (10:07 -0700)]
Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Jean-Baptiste Queru [Wed, 11 Aug 2010 17:27:17 +0000 (10:27 -0700)]
Merge "Fix isUsbMassStorageConnected() will always return true"
Jean-Baptiste Queru [Wed, 11 Aug 2010 17:11:14 +0000 (10:11 -0700)]
Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:55:36 +0000 (09:55 -0700)]
Merge "Fix build on some linux machines"
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:29:03 +0000 (09:29 -0700)]
Merge "SIM toolkit enhancements and bug fixes"
Omprakash Dhyade [Thu, 5 Aug 2010 23:28:37 +0000 (16:28 -0700)]
frameworks/base: Swap width and height of temporary buffer only with
orientation change
Current code swaps the width and height by assuming that aspect
ratio of the buffer width and height will be same as that of the
layout clip width and height. That is not always true.
Change the check to orientation change.
Change-Id: Ie387f3a7369025427484e4173cbde7a08df2b9d7
Kenny Root [Tue, 10 Aug 2010 22:22:13 +0000 (15:22 -0700)]
Merge "Sort the IME list before showing to user"
Naomi Luis [Fri, 23 Apr 2010 01:04:31 +0000 (18:04 -0700)]
frameworks/base/opengl: Add NULL check
Check for the validity of the attrs_list in eglChooseConfig before using
it. This avoids a crash during tests in which the attributes are NULL.
Change-Id: I1c0a46b505ae919e2454cfdce32f8dfc21ead247
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:42:09 +0000 (11:42 -0700)]
Merge "Fix a bug that prevented the creation of EGL shared contexts."
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:44:00 +0000 (10:44 -0700)]
Merge "Cat: Move Stk imlpementation into Cat folder"
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:42:15 +0000 (10:42 -0700)]
Merge "Ccat: Initial CCAT implementation"
Jamie Gennis [Fri, 2 Jul 2010 18:39:12 +0000 (11:39 -0700)]
Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
Jean-Baptiste Queru [Thu, 29 Jul 2010 22:01:24 +0000 (15:01 -0700)]
Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Jean-Baptiste Queru [Thu, 29 Jul 2010 21:37:48 +0000 (14:37 -0700)]
Merge "Make hasIccCard return true if RUIM card is present."
Romain Guy [Thu, 29 Jul 2010 21:00:48 +0000 (14:00 -0700)]
Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Romain Guy [Thu, 29 Jul 2010 21:00:02 +0000 (14:00 -0700)]
Merge "Fixed a documentation Bug (Issue 9236)"
Jean-Baptiste Queru [Mon, 26 Jul 2010 17:01:19 +0000 (10:01 -0700)]
Merge "move native services under services/"
Jean-Baptiste Queru [Mon, 26 Jul 2010 16:56:10 +0000 (09:56 -0700)]
Merge "Fix build."
Jean-Baptiste Queru [Sat, 24 Jul 2010 00:35:13 +0000 (17:35 -0700)]
Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Jean-Baptiste Queru [Fri, 23 Jul 2010 22:24:55 +0000 (15:24 -0700)]
Merge "dependent change for "parse instrumentation result bundles" in sdk"
Romain Guy [Fri, 23 Jul 2010 21:05:40 +0000 (14:05 -0700)]
Merge "Remove compilation warnings by removing illegal characters"
Jean-Baptiste Queru [Thu, 22 Jul 2010 22:55:31 +0000 (15:55 -0700)]
Merge "frameworks/base: Implement Mutual exclusion in BroadcastReceiver"
Mathias Agopian [Thu, 22 Jul 2010 22:27:48 +0000 (15:27 -0700)]
move native services under services/
moved surfaceflinger, audioflinger, cameraservice
all native services should now reside in this location.
Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
Jean-Baptiste Queru [Thu, 22 Jul 2010 19:22:55 +0000 (12:22 -0700)]
Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
Jean-Baptiste Queru [Thu, 22 Jul 2010 18:38:05 +0000 (11:38 -0700)]
Merge "Correct VM number updation during MBDN refresh."
Jean-Baptiste Queru [Tue, 20 Jul 2010 18:22:45 +0000 (11:22 -0700)]
Merge "Shoud specify the Resource class instance as an argument of the method newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815"
Romain Guy [Tue, 20 Jul 2010 18:11:20 +0000 (11:11 -0700)]
Merge "replaced deprecated setButton Methods"
Romain Guy [Mon, 19 Jul 2010 17:30:16 +0000 (10:30 -0700)]
Merge "Replaced deprecated calls to setButton and setButton2"
Romain Guy [Mon, 19 Jul 2010 17:29:59 +0000 (10:29 -0700)]
Merge "Replaced deprecated setButton Methodcalls"
Romain Guy [Fri, 16 Jul 2010 01:24:02 +0000 (18:24 -0700)]
Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value."
Romain Guy [Thu, 15 Jul 2010 17:49:47 +0000 (10:49 -0700)]
Merge "Added method getPreferredHttpHost"
Romain Guy [Thu, 15 Jul 2010 16:40:34 +0000 (09:40 -0700)]
Merge "Allow ListPreference summary to use entry"
Romain Guy [Thu, 15 Jul 2010 16:39:42 +0000 (09:39 -0700)]
Merge "Make HTTP Header class handle multiple cache-control fields."
Romain Guy [Thu, 15 Jul 2010 16:39:19 +0000 (09:39 -0700)]
Merge "Makes PhoneNumberUtils support international numbers after a CLIR command."
Jean-Baptiste Queru [Wed, 14 Jul 2010 16:03:30 +0000 (09:03 -0700)]
Merge "Start app with several activities with intent filter [Main, Launcher] was broken"
Jean-Baptiste Queru [Tue, 13 Jul 2010 23:20:30 +0000 (16:20 -0700)]
Merge "Telephony: Process MT SMS with MTI set to 3"
Romain Guy [Mon, 12 Jul 2010 18:35:31 +0000 (11:35 -0700)]
Merge "Fixed a Documentation Error in the AsyncTask Contstructor"
Jean-Baptiste Queru [Mon, 12 Jul 2010 18:14:56 +0000 (11:14 -0700)]
Merge "Fix hang when error in SIM card communication"
Jean-Baptiste Queru [Mon, 12 Jul 2010 17:54:11 +0000 (10:54 -0700)]
Merge "Reduced Warnings by adding Type Arguments and removing unused imports"
Jean-Baptiste Queru [Mon, 12 Jul 2010 17:43:17 +0000 (10:43 -0700)]
Merge "Documentation Bug (Issue 9557)"
Jean-Baptiste Queru [Fri, 9 Jul 2010 21:06:38 +0000 (14:06 -0700)]
Merge "Improved logging when there's an error creating the directories in getFilesDir()"
Jean-Baptiste Queru [Thu, 8 Jul 2010 23:25:03 +0000 (16:25 -0700)]
Merge "update 404'd source.android.com URLs"
Jean-Baptiste Queru [Thu, 1 Jul 2010 20:46:03 +0000 (13:46 -0700)]
Merge "Fix missing NL"
Scott Main [Mon, 28 Jun 2010 22:31:11 +0000 (15:31 -0700)]
am
337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '
337b0873f43eac5f23483bec94bd8729f79d47ec' into froyo-plus-aosp
* commit '
337b0873f43eac5f23483bec94bd8729f79d47ec':
docs: update backup guide and bmgr tool
Jens Gulin [Tue, 22 Jun 2010 20:21:57 +0000 (22:21 +0200)]
Keep track of remaining fd when devices are removed
Sometimes the wrong fd was accessed when the device was addressed
by device id.
The earlier implementation assumed that two arrays were in sync
but one of them was compacted when devices were removed. Instead
of that dependency the device now keeps track of it's file descriptor.
Change-Id: I2b8a793d76b89ab464ae830482b309fe86031671
Bruce Beare [Fri, 25 Jun 2010 16:08:12 +0000 (09:08 -0700)]
Fix missing NL
Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Scott Main [Fri, 25 Jun 2010 01:14:06 +0000 (18:14 -0700)]
am
56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '
56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp
* commit '
56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Scott Main [Fri, 25 Jun 2010 01:10:41 +0000 (18:10 -0700)]
Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo
Dianne Hackborn [Thu, 24 Jun 2010 23:02:03 +0000 (16:02 -0700)]
am
5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '
5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp
* commit '
5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
Dianne Hackborn [Thu, 24 Jun 2010 23:00:06 +0000 (16:00 -0700)]
Merge "Properly note the current active restore set's token" into froyo
Nick Pelly [Thu, 24 Jun 2010 18:55:56 +0000 (11:55 -0700)]
am
d19c397b: Merge "Do not log AT command traffic by default." into froyo
Merge commit '
d19c397b04f485e0af5990f3541e703934869290' into froyo-plus-aosp
* commit '
d19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
Nick Pelly [Thu, 24 Jun 2010 18:52:39 +0000 (11:52 -0700)]
Merge "Do not log AT command traffic by default." into froyo
Scott Main [Wed, 23 Jun 2010 17:08:45 +0000 (10:08 -0700)]
am
753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '
753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp
* commit '
753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
Scott Main [Wed, 23 Jun 2010 16:57:46 +0000 (09:57 -0700)]
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Dirk Dougherty [Tue, 22 Jun 2010 18:24:01 +0000 (11:24 -0700)]
am
17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '
17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp
* commit '
17ae646586663c59ad360bb72884beded7475687':
Doc change: Fix description of certificate matching requirement for app updates.
Dirk Dougherty [Tue, 22 Jun 2010 18:13:48 +0000 (11:13 -0700)]
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Kenny Root [Mon, 21 Jun 2010 18:16:25 +0000 (11:16 -0700)]
am
30cf330f: Import revised translations
Merge commit '
30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp
* commit '
30cf330fae137587d51aa4c026459db146705ba9':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 16:15:29 +0000 (09:15 -0700)]
am
c4e38577: Import revised translations
Merge commit '
c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp
* commit '
c4e38577f46a3b7953fffbb01b08eebc401fbc17':
Import revised translations
The Android Open Source Project [Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)]
merge from open-source master
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
The Android Open Source Project [Fri, 18 Jun 2010 19:44:20 +0000 (12:44 -0700)]
merge from open-source master
Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7
The Android Open Source Project [Fri, 18 Jun 2010 19:40:42 +0000 (12:40 -0700)]
merge from open-source master
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
The Android Open Source Project [Fri, 18 Jun 2010 18:36:35 +0000 (11:36 -0700)]
merge from open-source master
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
Dianne Hackborn [Thu, 17 Jun 2010 23:58:15 +0000 (16:58 -0700)]
am
57f4503e: Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '
57f4503e1a129d6a648f2378d36a060998a577a0' into froyo-plus-aosp
* commit '
57f4503e1a129d6a648f2378d36a060998a577a0':
Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Scott Main [Thu, 17 Jun 2010 19:23:58 +0000 (12:23 -0700)]
am
5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '
5f11e95f0041e163e8aa9e429aec92c8ee942233' into froyo-plus-aosp
* commit '
5f11e95f0041e163e8aa9e429aec92c8ee942233':
docs: small edits to catchup to edits made in html pushed live
James Dong [Thu, 17 Jun 2010 19:23:48 +0000 (12:23 -0700)]
am
39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '
39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp
* commit '
39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
Dave Sparks [Thu, 17 Jun 2010 19:23:44 +0000 (12:23 -0700)]
am
3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '
3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp
* commit '
3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
TimedEventQueue is apparently important for glitch-free media playback, and so
Scott Main [Thu, 17 Jun 2010 19:23:35 +0000 (12:23 -0700)]
am
821ca518: docs: edits to resources doc
Merge commit '
821ca51857f4d21b231cd9ead786227b771fe759' into froyo-plus-aosp
* commit '
821ca51857f4d21b231cd9ead786227b771fe759':
docs: edits to resources doc
Scott Main [Thu, 17 Jun 2010 19:23:18 +0000 (12:23 -0700)]
am
bccedb03: docs: update dashboard again
Merge commit '
bccedb03fad4e72c1776d2ab9e918fab4d25f222' into froyo-plus-aosp
* commit '
bccedb03fad4e72c1776d2ab9e918fab4d25f222':
docs: update dashboard again
Dan Morrill [Thu, 17 Jun 2010 19:23:03 +0000 (12:23 -0700)]
am
6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '
6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp
* commit '
6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
James Dong [Wed, 16 Jun 2010 23:10:52 +0000 (16:10 -0700)]
Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Dave Sparks [Wed, 16 Jun 2010 21:11:40 +0000 (14:11 -0700)]
Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo
Scott Main [Wed, 16 Jun 2010 02:43:19 +0000 (19:43 -0700)]
am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8' into froyo-plus-aosp
* commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8':
docs: update dashboard
Scott Main [Wed, 16 Jun 2010 02:33:03 +0000 (19:33 -0700)]
Merge "docs: update dashboard" into froyo
Ying Wang [Tue, 15 Jun 2010 22:32:36 +0000 (15:32 -0700)]
am
6567adf8: Move android-common to framework/ex
Merge commit '
6567adf8b637c36817625cd38d64cd4b8510b097' into froyo-plus-aosp
* commit '
6567adf8b637c36817625cd38d64cd4b8510b097':
Move android-common to framework/ex
Ying Wang [Tue, 15 Jun 2010 20:45:08 +0000 (13:45 -0700)]
Move android-common to framework/ex
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
Jean-Baptiste Queru [Tue, 15 Jun 2010 22:11:34 +0000 (15:11 -0700)]
Merge "Fixing counting the number of days in call log screen."
Joe Onorato [Tue, 15 Jun 2010 21:24:58 +0000 (14:24 -0700)]
am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp
* commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 21:24:51 +0000 (14:24 -0700)]
am
9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp
* commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Joe Onorato [Tue, 15 Jun 2010 20:59:10 +0000 (13:59 -0700)]
Merge "Use the droidcore goal with dist-for-goals." into froyo
Joe Onorato [Tue, 15 Jun 2010 20:58:33 +0000 (13:58 -0700)]
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
Romain Guy [Tue, 15 Jun 2010 18:47:02 +0000 (11:47 -0700)]
Merge "fillWindow's start position must be smaller than getCount value"
Romain Guy [Tue, 15 Jun 2010 18:46:42 +0000 (11:46 -0700)]
Merge "Change in media scanner to set correct date"
The Android Open Source Project [Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)]
merge from open-source master
Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
The Android Open Source Project [Tue, 15 Jun 2010 18:37:17 +0000 (11:37 -0700)]
merge from open-source master
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
The Android Open Source Project [Tue, 15 Jun 2010 18:34:57 +0000 (11:34 -0700)]
merge from open-source master
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
Scott Main [Tue, 15 Jun 2010 17:45:55 +0000 (10:45 -0700)]
am
457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '
457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp
* commit '
457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:45:50 +0000 (10:45 -0700)]
am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp
* commit '
322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
Jean-Baptiste Queru [Tue, 15 Jun 2010 17:40:51 +0000 (10:40 -0700)]
Merge "Fix that InputDeviceReaderThread that got killed during startup"
Scott Main [Tue, 15 Jun 2010 17:36:27 +0000 (10:36 -0700)]
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Scott Main [Tue, 15 Jun 2010 17:36:14 +0000 (10:36 -0700)]
Merge "docs: fix markup error" into froyo
The Android Open Source Project [Tue, 15 Jun 2010 16:32:37 +0000 (09:32 -0700)]
merge from open-source master
Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
The Android Open Source Project [Tue, 15 Jun 2010 16:30:31 +0000 (09:30 -0700)]
merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c