Jeff Brown 6240634883 resolved conflicts for merge of a05088c1 to master ... Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521		2010-09-08 13:02:55 -07:00
..
binder	am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread	2010-08-31 15:06:24 -07:00
gui	Added SensorManager.getMinDelay()	2010-07-29 18:18:00 -07:00
pim
private	fix a race in SF buffer management	2010-08-26 17:42:27 -07:00
surfaceflinger	am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread	2010-08-24 17:56:40 -07:00
tts
ui	Add support for secure views.	2010-09-08 11:50:55 -07:00
utils	Modify native ALooper to take an explicit ident.	2010-09-07 15:46:55 -07:00