90b7d5009b
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp * commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f': Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider |
||
---|---|---|
awt | ||
camera/libcameraservice | ||
cmds | ||
include | ||
libs | ||
opengl | ||
vpn/java/android/net/vpn | ||
MODULE_LICENSE_APACHE2 | ||
NOTICE |