diff options
| author | Jesse Gunsch <gunsch@google.com> | 2014-04-09 23:50:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-09 23:50:35 +0000 |
| commit | 3c1c137579783fad81169da01d5c7c5819c81b07 (patch) | |
| tree | ee0deb7f1f9bd87e35cf6a8a7bb1d638de1c145e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6fdb5e6df178b3b1062ac67b505b288aa609a66b (diff) | |
| parent | 8d31358fb4f0f948fcfd07399d4247375dc5eea9 (diff) | |
am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev
* commit '8d31358fb4f0f948fcfd07399d4247375dc5eea9':
Merge "NsdService does not clean up after exiting clients"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions