Merge commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16'
* commit '84b0d236a307915d3de8ffeb6fad1d8b89cd8d16':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '20fcfac829f4919157bd986cdae29f27669f99dc'
* commit '20fcfac829f4919157bd986cdae29f27669f99dc':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6'
* commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp
* commit 'ed7755cc30fe6b2b0254207347629ad0cae094db':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp
* commit '34180d328c57a6a38bc85651fda0e69890ad7a9b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp
* commit '27123468b33cb61a1600079d583302b1b078b2ee':
Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
Merge commit '6ba3ef31fd4672df3fb886ff458329d0d15b8456'
* commit '6ba3ef31fd4672df3fb886ff458329d0d15b8456':
Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f' into eclair-mr2-plus-aosp
* commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f':
Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'fdde959c22b5758db15293bc442e01674727fa61'
* commit 'fdde959c22b5758db15293bc442e01674727fa61':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp
* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
* changes:
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp
* commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5':
Add a test for vCard composer.
Merge commit '75d562696e709b6d9e61a23fc86f0cfba15e655e'
* commit '75d562696e709b6d9e61a23fc86f0cfba15e655e':
don't turn off filtering/dithering when we scroll.
Merge commit 'af081aa1edf8f427f9684d5a9bdadc43e994fefd'
* commit 'af081aa1edf8f427f9684d5a9bdadc43e994fefd':
Add comment warning to not use hardware based autobrightness support.
Merge commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218' into eclair-mr2-plus-aosp
* commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218':
don't turn off filtering/dithering when we scroll.
Merge commit '0f2a4e6026a37fc8b321494f688e9f0e5a5bf744' into eclair-mr2-plus-aosp
* commit '0f2a4e6026a37fc8b321494f688e9f0e5a5bf744':
Add comment warning to not use hardware based autobrightness support.
Merge commit 'a6f7e41979cf34ab403c88b7c5521e1b5cfc442e'
* commit 'a6f7e41979cf34ab403c88b7c5521e1b5cfc442e':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '9baeff05a8bf9bd4479f2a357dca0463cc750202' into eclair-mr2-plus-aosp
* commit '9baeff05a8bf9bd4479f2a357dca0463cc750202':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6897e36b894b2a10fd8b2e3af6587b5f789fde72' into eclair-mr2
* commit '6897e36b894b2a10fd8b2e3af6587b5f789fde72':
Add comment warning to not use hardware based autobrightness support.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-mr2
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527'
* commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6' into eclair-mr2-plus-aosp
* commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2
* commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'adddd24f31291f733cd5f72898b92f13f37ae37c' into eclair-mr2-plus-aosp
* commit 'adddd24f31291f733cd5f72898b92f13f37ae37c':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2
* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit 'a2ec1f4cea5531fb824b3fb2802ef4573a4916d9' into eclair-mr2-plus-aosp
* commit 'a2ec1f4cea5531fb824b3fb2802ef4573a4916d9':
Add size checks for glBufferData and glBufferSubData
Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2
* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
Add size checks for glBufferData and glBufferSubData
