[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2c2 am: 70b6c13294 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I21f23724b7ebf022ff35596dd859057efe890eda

...

This commit is contained in:

Treehugger Robot

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

committed by Automerger Merge Worker

parent 5f7b19c7aa 70b6c13294

commit 0cb2bb830c

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