Jeff Brown 9aac262cb3 resolved conflicts for merge of 167449e5 to master ... Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67		2010-07-08 19:01:13 -07:00
awt
camera	am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo	2010-07-02 07:48:03 -07:00
cmds	Revert "Don't chdir into the keystore directory"	2010-06-19 04:44:22 +08:00
include	resolved conflicts for merge of 167449e5 to master	2010-07-08 19:01:13 -07:00
libs	resolved conflicts for merge of 167449e5 to master	2010-07-08 19:01:13 -07:00
opengl	am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread	2010-07-02 13:39:38 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE	Adding PacketVideo attribution in NOTICE.	2010-05-06 14:15:47 -07:00