Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 30 Nov 2011 02:36:13 +0000 (10:36 +0800)
commit7c35ccce3aacd7a83f7e7f6e81d5aaaed170899d
tree44ca46a17920166f516f0eb901fb7cc9e9ce3a0b
parent4b0965a601730ad6a65b588a6f731ef3dd0f6ac3
parent6a4a38525d60db7e915d559273d8c89db5a98edf
Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/usb/gadget/android.c