am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread

author Mike Lockwood <lockwood@android.com>

Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)
author Mike Lockwood <lockwood@android.com>
Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)
diff --cc Android.mk
Simple merge
diff --cc core/java/android/app/ContextImpl.java
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc services/java/com/android/server/NotificationManagerService.java
Simple merge
author	Mike Lockwood <lockwood@android.com>
	Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/ContextImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/NotificationManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history