summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-02-07 19:09:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-07 19:09:06 +0000
commit8d871f0e151750e6f0fa731233c29cd845aae0af (patch)
tree38e55e29a2bf8ba1c3f75dec622014bf9c685853 /keystore/java/android/security/KeyStore.java
parent86ef44bcc7331b91ff9d03960a662ef2c71880f0 (diff)
parent44dd389611bd3804adb785704490069fe97ce17f (diff)
Merge "[automerger skipped] Be more comprehensive about boot time RTC check am: bfbd98868e am: 998af0bf32 -s ours am skip reason: change_id I36bbe6dfebba79ad83ce536917d6893427a026dd with SHA1 3d65d4d595 is in history"
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions