commit | 5ca457bd9d9fce97a5bcb967d9db042b4ab03b2d | [log] [tgz] |
---|---|---|
author | Rubin Xu <rubinxu@google.com> | Fri Jul 17 09:01:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:01:18 2020 +0000 |
tree | b5cfb625593ee76970cf6ed8d3481222c73f7a0f | |
parent | 756576f0437e09e1df4a80a1a635aa9881c5697e [diff] | |
parent | 404cd07e97bd3d19b5dbd8953aad8041f54a1ca3 [diff] |
[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: 404cd07e97 am: 294cbeed69 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580 Change-Id: I15979ecd70a91d4eeb549524bb2339584cfbe7b3