diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-23 19:20:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:20:27 +0000 |
| commit | fba926118ed7d5465cb6e7b64d29153212f7cbee (patch) | |
| tree | f25b2af763dcb5e6c2a3da08c4850d3cfbd49db4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1 (diff) | |
| parent | fcf9acb95a536f939a418529f642e60f51f5886a (diff) | |
am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
Add callback to voice interaction session for lockscreen shown
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions