Jeff Brown 9efdba3c3d resolved conflicts for merge of aa522ac8 to master ... Change-Id: Ib17ff201e770abc6b9edb58e01f3bb483dc8fa56		2010-09-21 16:45:16 -07:00
cmds	added BinderService<> template to help creating native binder services	2010-07-14 18:43:19 -07:00
include	am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread	2010-09-21 15:57:13 -07:00
libs	am 4ec134cd: am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread	2010-09-21 15:57:13 -07:00
opengl	am 5c746522: am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread	2010-09-20 19:32:01 -07:00
services/surfaceflinger	fix [3018216] UI shrinks / stretches while using apps with IME	2010-09-21 10:52:42 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00