diff options
| author | Cedric Ho <cedricho@google.com> | 2015-04-27 16:41:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-27 16:41:33 +0000 |
| commit | 0af3af0397cb6a92ea140736e84f7484ce029071 (patch) | |
| tree | e8e220736f1ecd54419eaefa341b6a11e54e1a94 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8 (diff) | |
| parent | 991c8c53aff32f3d605f6715b3fa78a86990f7ff (diff) | |
am 991c8c53: Merge "Enable VoiceInteractionService on watch." into lmp-mr1-modular-dev
* commit '991c8c53aff32f3d605f6715b3fa78a86990f7ff':
Enable VoiceInteractionService on watch.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions