summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-09-26 18:08:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-26 18:08:31 +0000
commit0a094c61bc1150585af3e60be7de3a5b17fa5573 (patch)
tree7e7749d44e278ddbc4653c7e8236b98f473b9176 /policy
parent3cedef53ce8dbebb4bfabc5909914bd270629540 (diff)
parent56a3e67433fe1d6649c7665d58e913e784a0ea1c (diff)
downloadframeworks_base-0a094c61bc1150585af3e60be7de3a5b17fa5573.zip
frameworks_base-0a094c61bc1150585af3e60be7de3a5b17fa5573.tar.gz
frameworks_base-0a094c61bc1150585af3e60be7de3a5b17fa5573.tar.bz2
Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions