summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-06-02 20:50:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-02 20:50:55 +0000
commit56dbe3ee4bea8fce11a2698a44778e264e9ec2db (patch)
tree844fde7a4abd3762d40d977c426168ab3f445c25 /core/java/android/provider
parentffa8f101ccdaae5aff14f7368e8910920157c615 (diff)
parent46fa08d66483bf041fdc0a4eace63f9addf8e629 (diff)
downloadframeworks_base-56dbe3ee4bea8fce11a2698a44778e264e9ec2db.zip
frameworks_base-56dbe3ee4bea8fce11a2698a44778e264e9ec2db.tar.gz
frameworks_base-56dbe3ee4bea8fce11a2698a44778e264e9ec2db.tar.bz2
Merge "Hide and disable emergency assist API" into mnc-dev
Diffstat (limited to 'core/java/android/provider')
0 files changed, 0 insertions, 0 deletions