Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c3de62bb

Commit c3de62bb authored 3 years ago by Aaron Huang Committed by Automerger Merge Worker 3 years ago

Downloads
- Plain Diff

Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 3498c7a5...

Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 3498c7a5 am: 90d6cafc am: b0b2e115

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

Change-Id: I7f36a7e3fd1f0293203dd06ababa8c852a1ffc8d

parents 4b30a3ee b0b2e115

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Android.bp 0 additions, 1 deletion

Android.bp
core/java/android/net/annotations/PolicyDirection.java 0 additions, 4 deletions

core/java/android/net/annotations/PolicyDirection.java
packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java 8 additions, 1 deletion

...nnectivityT/framework-t/src/android/net/IpSecManager.java

with 8 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment