last derp

Change-Id: I5380144a0ec1f1acdea05a7e993e262c79fd2863
fix derp

Change-Id: I19986757342349c2ec764c093f6a87682d9e7043
trebuchet and whisper commit

Change-Id: Id80e9ba83272914b4cd2a0bb8d786ed81653e5bf
Revert "Settings: Add preference for EdgeGesture service."

This reverts commit 36d5257caa6a1218755793b9dde0c67a208a7607.
Revert "[1/2] Settings: AppOps: Add bootup template"

This reverts commit c7e99d16e37c75b6ccd4138edcda7cddd24a9997.
Revert "[1/2] Settings AppOps: show/hide app type and allow/deny counters"

This reverts commit c4758af51e11a99c86eac3b1ed54242d1fe53fc2.

Conflicts:
	res/values/cm_strings.xml

Change-Id: Ib8eb62fdf664c8cc37ff98ff01b1599652e2fe32
revert

Change-Id: I617c2598ca04c43348ca6fece90758e8e11beec2
Revert "[1/2] Settings AppOps: Forward port wifi/bluetooth/mobile/wakeup ops"

This reverts commit c8b99daffc394a8ecdab0e8d960333bc8b231575.

Conflicts:
	res/values/cm_arrays.xml

Change-Id: Ib0bc438d26caf9e82c6c1b2fe5ef1a920cc3d81b
revert app opps

Change-Id: I6c5ab77e33bd8629881ecd22aafe198e1f7a8415

Conflicts:
	res/values/cm_arrays.xml