Mathias Agopian a7a3160daa resolved conflicts for merge of bc54e63c to master ... Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1		2010-07-21 18:10:22 -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
gui	new SensorService	2010-07-19 17:57:29 -07:00
pim
private	allow re-targetting of surfaces	2010-06-08 20:10:02 -07:00
surfaceflinger	Re-use existing Surface objects when reading them from parcels.	2010-07-16 13:03:15 -07:00
tts
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