summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@android.com>2014-04-30 01:19:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 01:19:52 +0000
commit3e320a0cac461859582d6b0a57f1d87182b996b9 (patch)
treee9439f77ad81841dcf778d1f5e8899442af51aec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentad85d5422b46a44e9a2166436c34c11e59d30e0c (diff)
parent9feab5f278d8c9e030e72989a7f6f3d2f376748d (diff)
am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d': Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions