Fix resource IDs being added to the android namespace

Using @+android:id/some_id will create a new resource ID
with package ID 0x01 rather than 0x7f, for non framework
packages, if "some_id" does not already exist.

Change-Id: I86d57ae6ac88e7dae8420a92e4d55b6c935fd188
Remove double tap, make long press to enable torch [2/2]

Change-Id: Iccee323bc52db59a06d125788ca29c355851b8a1
Signed-off-by: scott <scott@ubuntu.com>
Settings: Allow disabling of FC dialogs (2/2)

Change-Id: Icffc2dfe66fcb9de98e37ffd86ef5ac870469e93
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	src/com/android/settings/beanstalk/MiscSettings.java
Settings/Wifi: Add support for Ad-hoc (IBSS) networks

If the WLAN driver can support IBSS mode, show Ad-Hoc (IBSS) networks in the
list of available Wi-Fi networks and allow to connect to or create new Ad-Hoc
networks.

This is merged and ported from CM-10.2, where it was split up into 3 commits.

Change-Id: Ib58d05d05ce00a77d5b88ee57007d38798d7b43d