Mathias Agopian ce49d03aa4 resolved conflicts for merge of 02513855 to master ...

Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c

2010-07-29 22:06:44 -07:00

..

android_runtime

am 9c37e5ad: am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread

2010-07-16 09:12:29 -07:00

binder

am 245cb784: am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread

2010-07-27 14:04:14 -07:00

camera

am 4506c62a: fix inaccurate copyrights

2010-07-29 17:52:09 -07:00

gui

Added SensorManager.getMinDelay()

2010-07-29 18:18:00 -07:00

media

am 0c51c98f: am 4506c62a: fix inaccurate copyrights

2010-07-29 17:54:42 -07:00

pim

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

private

fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.

2010-07-27 20:11:35 -07:00

surfaceflinger

Re-use existing Surface objects when reading them from parcels.

2010-07-16 13:03:15 -07:00

tts

Update TTS plugin interface to receive engine configuration data

2010-03-18 11:52:41 -07:00

ui

DO NOT MERGE: Fix input event injection ANRs on UI thread.

2010-07-29 12:54:27 -07:00

utils

Support streaming of compressed assets > 1 megabyte

2010-07-28 15:33:28 -07:00