| commit | df0053fc49e7f750da7d8701a6fb42b753cc0bc0 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Oct 16 23:24:13 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 16 23:24:13 2020 +0000 |
| tree | bd466f78b82cbc9dd3487338ef3fced6cecf6fe8 | |
| parent | ce48de8252b832c693e360b78bdd91efe4418605 [diff] | |
| parent | 4cddef19b10bdcebe1e53c42fc2912f19e22e5e4 [diff] |
Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518 am: 4cddef19b1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433 Change-Id: I2f7b92f59747df7a78ce72ff5df26d486907be56