diff options
| author | Benjamin Miller <benjaminmiller@google.com> | 2017-07-28 21:52:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-28 21:52:18 +0000 |
| commit | f6ae53ecab7a3b49f8b88a656071518a8ec07d67 (patch) | |
| tree | f01e23226ecfc580ff5b2559fc318c16287f2bca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12fde33e23d282e8c1a1b6b19a271dfc5ae8710a (diff) | |
| parent | cd0ca9a47612d81e64473d615abfc54ed64ddb5e (diff) | |
Merge "Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f am: 5934ae605a am: ae4b64ab41" into oc-mr1-dev-plus-aosp
am: cd0ca9a476
Change-Id: Ie2cc42c2f28b842ad0a28176e0ca4721ca3f1361
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions