summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/6/changes
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-10-21 16:07:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-21 16:07:53 -0700
commit46cfa691379af957cabecac83ae909ba83f93a8f (patch)
tree3d23c58de9ee53a8ab6cb01b50dca447a00cf59f /docs/html/sdk/api_diff/6/changes
parent4eaca59766e4631ff9ab6a8648f2444252d7ff40 (diff)
parent9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c (diff)
am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit '9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c': Change pairing api/intent permission from PRIVILEGED to ADMIN
Diffstat (limited to 'docs/html/sdk/api_diff/6/changes')
0 files changed, 0 insertions, 0 deletions