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