diff options
| author | Victor Chang <vichang@google.com> | 2016-07-13 18:47:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 18:47:10 +0000 |
| commit | ec548dbb7587f6edafd8737f9d360ca415484dc4 (patch) | |
| tree | 8bcbcfcb89232926eb328190c1b8c94c3ec797a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0812bbcc18dbb0c7d44d2de7f90ea0a1b2277ed6 (diff) | |
| parent | 87ec0ef5e2aae7a078c132e70f017ac01e899690 (diff) | |
Merge \\"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\\" into nyc-mr1-dev am: e05b35db0d
am: 87ec0ef5e2
Change-Id: Ib6ed82c6e9e48cb7f08cfca194331796c5cdd5ba
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions