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