am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while...

author Jean-Baptiste Queru <jbq@google.com>

Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)

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

Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
author Jean-Baptiste Queru <jbq@google.com>
Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
diff --cc res/values-zh-rCN/strings.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Jean-Baptiste Queru <jbq@google.com>
	Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
		1	2
res/values-zh-rCN/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history