diff options
author | Hugo Benichi <hugobenichi@google.com> | 2016-07-26 05:34:56 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-26 05:34:56 +0000 |
commit | 02dade4bcefdb94807334330b82b6a61a29d2449 (patch) | |
tree | e973514b4f9e7ce4c819ba681c310b52793db426 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 524b2e4f305c2d4d9fd332daf5041d68e8f8efa7 (diff) | |
parent | 7c731f9e1f01550536c0bbd97cf696dec2cdcc95 (diff) |
Merge \"Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission\" into nyc-mr1-dev
am: 7c731f9e1f
Change-Id: I22c2a9aaedcdbf842c1afe119edaaac18c3522df
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions