diff options
author | Justin Koh <justinkoh@google.com> | 2014-05-05 22:38:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-05 22:38:13 +0000 |
commit | fd04632ab5fe9272b0f1d2ff94367a574e026a5b (patch) | |
tree | bb636c022779e3ae9d22921e2ae65dcff7456c0f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 68ca14648c88d84080cafae02c9bc5cf3448096a (diff) | |
parent | 3caf92582498bad8fe79f6e3235be218e82b7f68 (diff) |
am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
Hide getDeviceGlobalActionKeyTimeout
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions