| commit | 0cb2bb830c4d3c7282c19119e3013a4e6c62c7d8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 17 09:01:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:01:32 2020 +0000 |
| tree | de9a72680df48442f068cd6354fb650df4643ae8 | |
| parent | 5f7b19c7aa332c2307176e8d8fdcab9f10accc59 [diff] | |
| parent | 70b6c13294d9316576833fb947e41f70472a3e8e [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 am: 70b6c13294 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580 Change-Id: I21f23724b7ebf022ff35596dd859057efe890eda