diff options
| author | Robin Lee <rgl@google.com> | 2016-05-25 21:20:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 21:20:43 +0000 |
| commit | 30c63961dd12fb5b8e3565bebc86c0c7a5faaa54 (patch) | |
| tree | b818dad13655ee6785f7856ddee6cfe22a4d8f06 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 48d08caa30c04ced21f11149ba2e117635c5db5d (diff) | |
| parent | 48b18f4fa994e201e3eb4cca1e7c823b198359c5 (diff) | |
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
am: 48b18f4fa9
* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
Return legacy VPN info regardless of lockdown mode
Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions