summaryrefslogtreecommitdiffstats
path: root/include/hardware/keymaster_defs.h
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-07-07 11:51:13 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-07-07 14:15:40 -0700
commit65ea8efbcdb83d94db3e149bf93c5ab90ab0bcf9 (patch)
treec3dddf593fd88f3d482f4e503d7a022126c82cb8 /include/hardware/keymaster_defs.h
parent397277cc4ee0764184d3a5eaeea9f3dd26c996ab (diff)
parent8b3d5a64c3c8d010ad4517f652731f09107ae9c5 (diff)
downloadhardware_libhardware-65ea8efbcdb83d94db3e149bf93c5ab90ab0bcf9.zip
hardware_libhardware-65ea8efbcdb83d94db3e149bf93c5ab90ab0bcf9.tar.gz
hardware_libhardware-65ea8efbcdb83d94db3e149bf93c5ab90ab0bcf9.tar.bz2
Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEAD
Ticket: CYNGNOS-3020 Change-Id: I1dd9d12d2131710416ee570e4b12e9cfad1f3ab4
Diffstat (limited to 'include/hardware/keymaster_defs.h')
0 files changed, 0 insertions, 0 deletions