Jeff Brown 9aac262cb3 resolved conflicts for merge of 167449e5 to master ... Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67		2010-07-08 19:01:13 -07:00
..
binder	am efcf68aa: am ef8f96a7: Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread	2010-06-23 10:18:18 -07:00
pim
private	allow re-targetting of surfaces	2010-06-08 20:10:02 -07:00
surfaceflinger	Introduce official public NativeWindow type.	2010-06-30 15:32:04 -07:00
tts	Update TTS plugin interface to receive engine configuration data	2010-03-18 11:52:41 -07:00
ui	Merge "More native input dispatch work." into gingerbread	2010-07-07 17:43:12 -07:00
utils	Add new native Looper API.	2010-07-02 18:57:02 -07:00