diff options
| author | Benjamin Miller <benjaminmiller@google.com> | 2017-07-28 21:29:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-28 21:29:27 +0000 |
| commit | 7a446355df71b491d38e7b9c3b042addab4df21e (patch) | |
| tree | 6befa30ed7036f4c2602a0fa0ae01566c6e3ba16 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 06a5cb86f2299e65ea990534faf3213c8d846cfc (diff) | |
| parent | 2c2d19504c96642b14516dac84618477ab3283c5 (diff) | |
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f am: c058675b80
am: 2c2d19504c
Change-Id: Icfc58e983492adcb84d51208e0a8e276768d7e24
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions