Mathias Agopian a7a3160daa resolved conflicts for merge of bc54e63c to master ... Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1		2010-07-21 18:10:22 -07:00
..
binder	am 3e5e21d4: am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread	2010-07-15 23:05:39 -07:00
gui	new SensorService	2010-07-19 17:57:29 -07:00
surfaceflinger_client	Remove some debug logging that I accidentally committed.	2010-07-19 16:09:26 -07:00
ui	Fix trackball down and movement bugs.	2010-07-16 17:46:03 -07:00
utils	resolved conflicts for merge of f7adbe10 to master	2010-07-16 10:06:33 -07:00