Fix Derp

Change-Id: I63cf6b970b4d827831d792ff8bc8844a95aa52fd
[1/2] Settings AppOps: show/hide app type and allow/deny counters

    Squash of:

    Author: Sam Mortimer <sam@mortimer.me.uk>
    Date:   Thu Oct 3 13:51:31 2013 -0700
    AppOps: menu options to show/hide user and system apps
    Change-Id: Ia55364c361db949a891e4b53a757ee4dff519eb6

    Author: Sam Mortimer <sam@mortimer.me.uk>
    Date:   Wed Oct 2 22:24:14 2013 -0700
    [1/2] AppOps: Show allowed/ignored counts
    Change-Id: Ia27737155c33e934df9a2a1fcff88379240fd096

    Author: Sam Mortimer <sam@mortimer.me.uk>
    Date:   Sun Dec 1 21:39:07 2013 -0800
    AppOps: only apply app type filters to summary screen
      *) If buildState() is called for a single package, do
         not apply hide user/system app filters.
      *) Fixes show detail display when called via
         long press in privacyguard and an AppOp hide
         filter is ticked.
    Change-Id: If31d094fb989836ab6829daeefe820695032c0ed

Change-Id: Ia55364c361db949a891e4b53a757ee4dff519eb6

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/ok_strings.xml
	src/com/android/settings/applications/AppOpsState.java