| commit | 2ed485da9ddec85ffc29699bd71c201e1881c8ae | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Fri Mar 05 05:59:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 05:59:25 2021 +0000 |
| tree | 1e18ea378a419420e152ad9ec359afd908dd73a5 | |
| parent | 52871db64d3660214be797a40b3ca08c91cc06d5 [diff] | |
| parent | bb865ae949a989338d994d3692cf8b1a6e1d7c07 [diff] |
[automerger skipped] Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d am: bb865ae949 -s ours am skip reason: Change-Id I27975113896ea137260a9f94a34fb1c3ca173fe3 with SHA-1 42f77b882f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0bd42249b22890ef71ece31e70e7c9a61cdb50e1