Sounds: remove misplaced/duplicate file

Change-Id: I4b6cc606735b1bd56dcccc11472f42aa0e5ef76b
Remove duplicate notifications

Acrux=Antares and Bellatrix=Betelgeuse.

I'm guessing these are duplicate due to differing
names. I believe Antares and Betelgeuse are the names
in AOSP, so leaving those two.

Change-Id: Ie58b20039bb4343c9907fc5bc31e099fd942bb87
Wifi: Allow configuration of the P2P ifname

ICS used the same wifi.interface as the regular wifi service.
Let's use wifi.p2pinterface here, since they _can_ be different

Change-Id: Iab68b245b33377271354c849bbe33725a26193f1

Conflicts:
	wifi/java/android/net/wifi/p2p/WifiP2pService.java
Add framework definition to include Torch

Change-Id: I21de929089b06e5022f90c1fab6228a543102a19
android.policy: Fix launching home when waking the device with the home button

Change-Id: I71845bf88943f5ef141ea5c533f997e09ab5b7f4

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java