Settings: Forward port ADB over network (Part 1 of 2)

Squashed commit of:
- Adb over network (Settings part for Jellybean)
  + Display WiFi IP Address & Port as preference summary.
  Note: adb_over_network were already pushed in 5555aae
  Author: Tanguy Pruvot
  Id: Ia05aa8f6281c9bdcb3d5e62566b103c38bc70b82

- Settings : Fix mismatched dialog listener
  Set listener on correct dialog
  Author: Danesh Mondegarian
  Id: I0c05af859ad0e93ba6a1d3d395dc6c31e9949426

- ADB: missing dialog dismiss, and use updateCheckBox()
  this function check if debug features are enabled.
  Author: Tanguy Pruvot
  Id: I675a3a9ce5c28b16f9e13e78499e5f6f897b9dd3

- DevelopmentSettings: Refactor ADB over Network
  The checkbox would never enable adbd in tcpip mode.
  Author: Alexander Hofbauer
  Id: Iab8307bb91f69d85ed3a46d5ef09274fa8b03da

Patchset 2 : Remove dupe checkbox and move to proper header

[mikeioannina]: Update for L

Change-Id: I3d61408946912fa0e5f796531413c78255257efe
Remove merge error in cm_arrays comment block

* Also fix the copyright header spacing

Change-Id: Ic9a795647392dd657b13362a8d0ffa3ac832c512
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into lp5.0

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java

Change-Id: Ic423e62c9135b5d9e768fdcd9f405bcda3af957a
Change Device info from CM version to BeanStalk version

Change-Id: I88e524997c103f20c28b299819c3eef1e1cbf90b
Signed-off-by: scott <scott@ubuntu>
move beanstalk settings under personalization in settings menu

Change-Id: I1e79cef1a74ae543a2195b64e9b1aa35d7c1d18b
Signed-off-by: scott <scott@ubuntu>