One does not simply become a Developer

Also contains:
From 2622e3cddd08448666fcfd584a8794727e1b2979 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Wed, 2 Jul 2014 16:32:03 +0300
Subject: [PATCH] Fix translatability of modified dev countdown strings

Change-Id: I3bc1749e27068a63144fd4f3b059396344e7858d

Change-Id: I64ab4d7ab9d8334275d2e4d493b716a8fc73ab4e
Add preference for enabling root access (3/3)

 * Root over ADB is now disabled by default on non-eng builds
 * Requires support in su binary and adbd
 * Root access can be configured to use ADB only, apps only, or all

Change-Id: I132a35a31c676511db954ff19120fa6d3c795b23

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

Settings: Make CM developer options additions respect the on/off toggle
This commit fixes the problem where, when dev options are turned off, our
CM customizations don't turn off with the rest of the options and the
dangerous option (root access) does not reset to a safe setting.

Change-Id: I879756ea353ce2940c05b224998fc1a945f2ceff

DevSettings: Fix the root-access toggle in eng builds

It was being unconditionally removed, put it back

Change-Id: I8eecab7353c59b224d917cc1710124f57656cf47
Merge remote-tracking branch 'cm/cm-12.0' into 5.0