am 9ca7d0c2: Merge change 24460 into eclair
am 9ca7d0c2: Merge change 24460 into eclair

Merge commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171' into eclair-plus-aosp

* commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171':
  The empty path and no path mean default path. So "a=d" should replace "a=c".

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base