remove merge derp

Change-Id: I8ab3f112c22909b17361c52ddea758ad5eb191e4
Frameworks: Add Permissions Management to AOKP [3/4]

Allows the user to revoke individual permissions on a per app basis.  Adapted from
CM7 commits 949eb057d81da7cd0a79fc1fe9cc9c4d989d1c27 and 4a0a352b36b21d0d22713c232baccca84ce13a2d
to work with 4.2.2

Change-Id: Ibc7be45b88838a2fffaff80514e77702d330de0f
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>