Jeff Brown cfa6d98278 resolved conflicts for merge of f7adbe10 to master ... Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7		2010-07-16 10:06:33 -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	first step at implementing the native sensor support	2010-07-13 22:21:56 -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	Implement native key pre-dispatching to IMEs.	2010-07-15 22:05:33 -07:00
utils	Fix bug with phantom input windows.	2010-07-16 00:02:48 -07:00