summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/AppOpsManager.java
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-06-01 08:32:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-01 08:32:11 -0700
commit8ebfb8c9c34caa80cd0d2451d950170c1b522f2a (patch)
tree0c0ed41ca85b6362822f33f4ff50d526bc868a7c /core/java/android/app/AppOpsManager.java
parent413adc9260d700bd8143950951c4e1ad07cbeddf (diff)
parentfdc0c8618b4e51c322f747202ff94508124e7c9c (diff)
downloadframeworks_base-8ebfb8c9c34caa80cd0d2451d950170c1b522f2a.zip
frameworks_base-8ebfb8c9c34caa80cd0d2451d950170c1b522f2a.tar.gz
frameworks_base-8ebfb8c9c34caa80cd0d2451d950170c1b522f2a.tar.bz2
am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c': Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Diffstat (limited to 'core/java/android/app/AppOpsManager.java')
0 files changed, 0 insertions, 0 deletions