| commit | 43cbc69a6b450e1a4f3f8b25ac60dafea55b50db | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Fri Jul 17 09:52:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:52:53 2020 +0000 |
| tree | 5ae216100b61510c713479724324494a028daa34 | |
| parent | 2f7b2335c7c51492aa5b89b4ada1f5ab451a20fb [diff] | |
| parent | 8a0209e355b047eb03e0863a389dc55f51265a47 [diff] |
[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 am: 294cbeed69 -s ours am: 5f7b19c7aa am: ef69c1a670 am: 8a0209e355 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580 Change-Id: I9714fb2a2b120b4fac710a168c3578ccea14236a