a47f02afb1
Merge change 2115 into donut * changes: bring the native_handle stuff back from master_gl Conflicts: libs/binder/Parcel.cpp |
||
---|---|---|
awt | ||
camera/libcameraservice | ||
cmds | ||
im/java/android/im | ||
include | ||
libs | ||
opengl | ||
MODULE_LICENSE_APACHE2 | ||
NOTICE |