Jeff Brown 4c766ccea5 resolved conflicts for merge of df3cccf3 to master ... Change-Id: I425496a9fc4e9cbc50ad6938e9dccb14827d9558		2010-10-27 22:18:43 -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	Replace epoll() with poll() and rename PollLoop to Looper.	2010-09-14 01:59:45 -07:00
pim
private	fix [2835280] Add support for cancelling buffers to ANativeWindow	2010-10-04 20:10:11 -07:00
surfaceflinger	am 7e9a54d4: am d4e03f37: addresses parts of 3096779 and 3097475	2010-10-16 08:52:30 -07:00
tts
ui	resolved conflicts for merge of df3cccf3 to master	2010-10-27 22:18:43 -07:00
utils	Revert "Add length-equality test in String operator== checks."	2010-10-20 17:06:28 -07:00