summaryrefslogtreecommitdiffstats
path: root/nfc-extras
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2013-05-21 11:06:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-21 11:06:05 -0700
commit049219925fc2fb3adee803731a2ccd1c6c7c580a (patch)
tree38dc216ac224745cbac26e8a51cf115d55ac1583 /nfc-extras
parent01549b001eea5062b5f4d8c54d9e6337c3c670db (diff)
parent66d67241205e857e434bacf1a1e8fb8e3100018d (diff)
downloadframeworks_base-049219925fc2fb3adee803731a2ccd1c6c7c580a.zip
frameworks_base-049219925fc2fb3adee803731a2ccd1c6c7c580a.tar.gz
frameworks_base-049219925fc2fb3adee803731a2ccd1c6c7c580a.tar.bz2
am 66d67241: am 34bed420: Merge "Update CALL_PRIVILEGED docs" into jb-mr2-dev
* commit '66d67241205e857e434bacf1a1e8fb8e3100018d': Update CALL_PRIVILEGED docs
Diffstat (limited to 'nfc-extras')
0 files changed, 0 insertions, 0 deletions