summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2016-06-02 00:11:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-02 00:11:49 +0000
commit3f8ec3331ec16525259d2ad0f181bad64d76c3e2 (patch)
tree4fd9c538c4c40703e1e8f626ef6b60fee0023b75 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent7c4986085e94b05398621cb4c0c9a43427ec5f2d (diff)
parente875210a2ce0007d477e927e24d21a60313e79ee (diff)
Merge "Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a am: d116e0fc14" into nyc-mr1-dev-plus-aosp
am: e875210a2c * commit 'e875210a2ce0007d477e927e24d21a60313e79ee': Move DownloadsManager to permanent whitelist. Change-Id: Ib0880f6b3152580973c2481da5bc67ac27aeee2b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions