| commit | ef69c1a670aa6f00d81778e81fe8e437de112bde | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Fri Jul 17 09:19:13 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 17 09:19:13 2020 +0000 |
| tree | f9d7a251bba6b08c016e334d66574a00f364ac57 | |
| parent | 6350508edd6573c34aaba1aaa68cc6afb8ef8c0d [diff] | |
| parent | 5f7b19c7aa332c2307176e8d8fdcab9f10accc59 [diff] |
[automerger skipped] [DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain am: ac51bf8a40 am: 294cbeed69 -s ours am: 5f7b19c7aa Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580 Change-Id: I0a31bbce6fbc74984536e387f027edc75c030124