Dianne Hackborn db05e228a4 resolved conflicts for merge of 05be6d6f to master ... Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212		2011-05-09 19:00:59 -07:00
..
binder	Make sure binder ioctl structs don't contain uninitialized values.	2011-04-21 14:37:15 +04:00
gui	frameworks/base: android_native_buffer_t -> ANativeWindowBuffer	2011-05-03 16:40:14 -07:00
surfaceflinger_client	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07:00
ui	resolved conflicts for merge of 05be6d6f to master	2011-05-09 19:00:59 -07:00
utils	am fbb0e9f9: am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"	2011-04-26 12:46:04 -07:00