summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe LaPenna <jlapenna@google.com>2015-04-03 21:13:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-03 21:13:30 +0000
commit97a7360660dc6473286a12d72eecff277e6182e1 (patch)
tree9c67b7ebec08a4f37ab0c6abe6858b48fdd9a8c4 /rs/java/android/renderscript/RenderScript.java
parent66d9451273c4a3775b6b63a0e4b7027bd2eae65d (diff)
parente59f426050f693b62bb5471fca5fb8b7ea2af8ea (diff)
am e59f4260: am 1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
* commit 'e59f426050f693b62bb5471fca5fb8b7ea2af8ea': Make burn in protection updates happen on the minute.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions