| commit | e5a56ace1bb9b42d975668b14479ad22969a47c7 | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Sat Jan 15 07:13:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 15 07:13:24 2022 +0000 |
| tree | c3b6d9c8360dbb9a8a483c57824f3c4179f5ccad | |
| parent | 6edadb712d84bd80d0fbf8fcb100574f6592c147 [diff] | |
| parent | e17803cee32ef824c0fefb05a3cfb275abf5e712 [diff] |
Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 5f70655025 am: 2d9163aaaf am: f7dd2dbb6b am: e17803cee3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928465 Change-Id: I757c9e684b9d1077573b6b705b151925a342e1cc