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