diff options
| author | Benedict Wong <benedictwong@google.com> | 2020-05-29 18:05:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 18:05:52 +0000 |
| commit | 40137e765ba7c26ea8ae145208ca180a0466d5c6 (patch) | |
| tree | 15c60e47b4c7ea82e563978d0c748a07d244e71a /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 011e7a7dd37f1c52f26b55998d4aaf64ffa84edb (diff) | |
| parent | 1c0cc3f3d88661bbaab984041950af045e75d76c (diff) | |
[automerger skipped] Merge "Add RequiresFeature annotations for IKEv2 VPN profiles" into rvc-dev am: c5401ef015 am: b7e4fc0606 am: 1c0cc3f3d8 -s ours
am skip reason: Change-Id I125d8fbe5d67fb877ad7d0636c007cb3e1a9f59b with SHA-1 29d6412115 is in history
Change-Id: I8890d7390638e58a55b7ecd763c485d881e2dee2
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions