Skip to content
Commit ef69c1a6 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

[automerger skipped] [DO NOT MERGE] Rollup changes from R related to... 

[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a am: 294cbeed -s ours am: 5f7b19c7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I0a31bbce6fbc74984536e387f027edc75c030124
parents 6350508e 5f7b19c7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment