Mathias Agopian 50558b9561 resolved conflicts for merge of bc54e63c to master ...

Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1

2010-07-21 18:10:22 -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 cc52121c: am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread

2010-07-15 23:05:35 -07:00

camera

Change camera interface to support multiple cameras.

2010-06-11 16:47:33 +08:00

gui

new SensorService

2010-07-19 17:57:29 -07:00

media

am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread

2010-07-21 10:41:45 -07:00

pim

…

private

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -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

Fix individual pointer id up/down reporting.

2010-07-16 15:11:24 -07:00

utils

Fix bug with phantom input windows.

2010-07-16 00:02:48 -07:00