tree c8bfb67e98d2aa58850034099cd22f1f38616f89
parent 0c8ea053fa83220605ce549323fd2e6ce52a25c0
author Dave Burke <daveburke@google.com> 1380128218 -0700
committer The Android Automerger <android-build@android.com> 1380574536 -0700

Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml