summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/Credentials.java
diff options
context:
space:
mode:
authorJian-Yang Liu <jianyliu@google.com>2019-11-18 13:48:18 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-18 13:48:18 -0800
commitd9e067e3f7f9df3fb945b763a4a55149d8bd7ed3 (patch)
treedf9dcaa6b8bf859a06ce3870e7997360683c1f3d /keystore/java/android/security/Credentials.java
parenta2186c9f79cb8e634ddbf067032f933bd9ea8769 (diff)
parentb8d760d3f4a782a6707f7475b12498dcbcd8e314 (diff)
[automerger skipped] Merge "Changed NotificationViewController to be enabled when car service is ready." into qt-qpr1-dev am: 17eb45ab54
am: b8d760d3f4 -s ours am skip reason: change_id I281fbdd833c23d8dc9d2430d8a6eaad7e4577c53 with SHA1 1d429ee4b8 is in history Change-Id: I387f97f94280aa37f798e43518ed97b9afc16c41
Diffstat (limited to 'keystore/java/android/security/Credentials.java')
0 files changed, 0 insertions, 0 deletions