summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-04-26 00:16:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-04-26 00:16:22 +0000
commitc90aa9590c57ed73d9b91f0f8563322a30dea11f (patch)
tree58e34bf3103472826562e46bd9b4e334bd322f7e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent41c1df9de514eb2f959a275cef36ebed37d754a6 (diff)
parent85aad222c24d5a6363625ce03784d7d0632b31a9 (diff)
Merge "Merge "When app is updated, save the new version code, and update shortcuts with resource based icons." into nyc-dev am: 711ffe6 am: 7497b70" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions