diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-02-25 21:40:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 21:40:38 +0000 |
| commit | 0fbcc7086fe742e641915ed5f097119d01613cb5 (patch) | |
| tree | 2a9c155aefb7515613e5ba75196f93bba9bfc550 /rs/java/android/renderscript/RenderScript.java | |
| parent | 892609ad34145e6418e42c683428f1a880b4c874 (diff) | |
| parent | 1e74b5d6b0e964b7a9e58e64b45f50aec15b1178 (diff) | |
am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
Burn in protection.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions