This reverts commit 90886b8284.
Conflicts:
src/com/android/settings/DevelopmentSettings.java
Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e
This reverts commit 90886b8284.
Conflicts:
src/com/android/settings/DevelopmentSettings.java
Change-Id: Ib41061bfbd74294ad643173c0caaf5f66bba410e