diff options
author | RoboErik <epastern@google.com> | 2014-05-21 19:59:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 19:59:11 +0000 |
commit | 5b53148a4e8d47b88362703445010c54f9fd6ecc (patch) | |
tree | 879e7fa812213756a040528de94894f34e061a5c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | afe18ed6cd409f75315da8e834554a56f0ec4651 (diff) | |
parent | 9a9d0b5f6f4be758ed6c8b837a9dd01a451bc0c0 (diff) |
Merge changes I1cbdff1d,I23906b4c
* changes:
Handle headsethook voice launching
Add 5s timeout to wakelock
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions