[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

Browse Source

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I6fe5213691b19719f9346b0713fa1049a5eafa69

...

This commit is contained in:

Treehugger Robot

2020-07-17 09:35:32 +00:00

committed by Automerger Merge Worker

parent 8a0209e355 e260ebd9af

commit d264c4d0fd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available