diff options
author | Will Haldean Brown <haldean@google.com> | 2014-03-24 17:33:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 17:33:55 +0000 |
commit | 125f2155bedf37841d7c9a9b59fb2680e41cfcef (patch) | |
tree | 1d47b70b5d9b393865233aceb9b1f0a0bc61ac64 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 70d78bbeecc491ebb0a30ee650d2445145992514 (diff) | |
parent | e3d4f6c19bb21dd20d95446def9a8872ecab2721 (diff) |
am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev
* commit 'e3d4f6c19bb21dd20d95446def9a8872ecab2721':
Make windowSwipeToDismiss a public attribute.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions