summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2017-03-15 09:51:28 -0700
committerBill Yi <byi@google.com>2017-03-15 09:51:28 -0700
commitced913df2ec2f2dd5365dc70a5893d5ca76ced6f (patch)
tree646f4df635324023e5e02b50e07a9c5b2b702b68
parent8e60049de38636a5916531677831a386d8cc7877 (diff)
parent85bb9b79212ed5460c50a0fa2ab6904f3c7ab02b (diff)
downloadlibnfc-nci-marshmallow-mr2-release.tar.gz
Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEADandroid-6.0.1_r81android-6.0.1_r80marshmallow-mr2-release
0 files changed, 0 insertions, 0 deletions