Jeff Brown 1a15c6eaff resolved conflicts for merge of aca672ba to master ... Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08		2010-07-15 23:47:29 -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	first step at implementing the native sensor support	2010-07-13 22:21:56 -07:00
surfaceflinger_client	Introduce official public NativeWindow type.	2010-06-30 15:32:04 -07:00
ui	Add support for new input sources.	2010-07-15 18:32:33 -07:00
utils	am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target.	2010-07-15 10:24:10 -07:00