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