| commit | 8a0209e355b047eb03e0863a389dc55f51265a47 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Fri Jul 17 09:35:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:35:20 2020 +0000 |
| tree | ab71a60d6dd8cfdb3af747de440c784d4f987637 | |
| parent | 64bb3e63f70becbba40a1b06360a7725ac3b672e [diff] | |
| parent | ef69c1a670aa6f00d81778e81fe8e437de112bde [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 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580 Change-Id: Ic8507306632667ca591a3f49e37f93e967e3baab