diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-07-11 13:17:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-11 13:17:55 +0000 |
| commit | 1a70ce6220c922da7c39714223003e87442e1fd5 (patch) | |
| tree | f926fcdd1df0b5840b22bd79b4c5786cb8d5d7e2 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 3f24335abf6ae4f0885a24b5efc93f27b3a8d087 (diff) | |
| parent | eed04347e73b07c7c726453c5931b335ce5f0303 (diff) | |
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am: d23be95dd7 -s ours
am: eed04347e7
Change-Id: I742f7418f887e2622e6e4286b47c855ef50a09bb
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions