Skip to content
Commit 5f7b19c7 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 skip reason: subject contains skip directive

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

Change-Id: I15979ecd70a91d4eeb549524bb2339584cfbe7b3
parents ef48aef3 294cbeed
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