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