Patch update : use actual storage type of sdcard/usb (1/2)
Fix for "volume buttons change two volume steps per click" bug

This bug happens on all devices since CM9 or CM10 times.

To reproduce:
1) disable Settings/Buttons/Playback control
2) start music playback
3) turn off display
4) click on the volume buttons

When "Playback control" is enabled, the volume changes on the button up
event of short clicks only. When it is disabled, it changes on both
button down and up events. This fix cleans up the code and makes the
volume change only on button down when "Playback control" is disabled.

JIRA: CYAN-3202
Change-Id: If97218e35a8204ef602155f22b7eaaa5e13fb93c
Show devices connected to the WiFi hotspot(1/2)

Change-Id: I8378e0ae07332f62b92a1681951f1236f6ef5ff9

Conflicts:
	services/java/com/android/server/connectivity/Tethering.java