summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/Credentials.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-17 18:38:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-17 18:38:33 +0000
commit32a79c9c0536c1f1331b36264cf25c4f47ad55c7 (patch)
tree0147161f78b1e30587a4098a4114422f89860f48 /keystore/java/android/security/Credentials.java
parent81b66fc0b5f42c20ef22e26311c8d2d1c340da43 (diff)
parent1043c0ce5e06fb4003abc76ae2544a5d6cbf90f9 (diff)
Merge "Include linux/fsverity.h and remove inlined definition" am: a91708379f am: 1043c0ce5e
Change-Id: I47d7f5a4e45691f2cb53647541ba379e93c05c6e
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
0 files changed, 0 insertions, 0 deletions