summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-12-06 18:59:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-06 18:59:01 -0800
commitad5814b5b118801a6de5147119e58d7494383bce (patch)
tree3fa3c2e9f9b488b142abbbacbb647d7832c32632 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent1a10de0f6be13dcb3630ef1bec86ae0ff6a035e4 (diff)
parentbc36b52372be154994f19a9e767184b2d6b4783a (diff)
am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev
* commit 'bc36b52372be154994f19a9e767184b2d6b4783a': DO NOT MERGE Adjust update interval when expiring location requests.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions