OSDN Git Service

am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)
commit88f379367f208a75dfe95a081b25c27a54b06a1a
tree4208d5af35eb271b1079f836d534b7ceb828a072
parent997b1f74c49314162635c5976fa369dfcd3385fb
parent1183f487c8ea8660415fcd30914844e8dc2de2bb
am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '1183f487c8ea8660415fcd30914844e8dc2de2bb':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
res/values-zh-rCN/strings.xml
res/values/strings.xml