diff options
author | Rubin Xu <rubinxu@google.com> | 2018-03-09 15:38:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-09 15:38:37 +0000 |
commit | f08622b28fb361a228634e5bf419b85bb3394267 (patch) | |
tree | 6af28bfc30db0a6e8da1b3fe8a66bbaadc8e3ca9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c7d733fe248c9b9f9ed1daa3ce38e9e4af026e01 (diff) | |
parent | edb887251313eb225262cc0c87a6d139369a93a7 (diff) |
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev am: a9df845321 am: 8dddc5e1f8
am: edb8872513 -s ours
Change-Id: Ia1047b019f4ee8844a2dc45be534747d5e799224
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions