diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-23 21:48:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 21:48:48 +0000 |
| commit | f30c5f56187fed6452d557a44df8b63d8eb130a2 (patch) | |
| tree | abd60115cec363b96a8307733e026e04d315c624 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aebb144b3c2651f19109c8f70f809e6e9f1a2e49 (diff) | |
| parent | 93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8 (diff) | |
am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
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