summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-14 23:55:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-14 23:55:35 +0000
commit7b09e7a9f3ef804e9cd159023b64eac1ef8b7931 (patch)
treeed8c9d46bbc1e14fc1aa2ee0ca8c6658a0392224 /rs/java/android/renderscript/RenderScript.java
parent1d5a259276c897743936b250cde5e22555604d62 (diff)
parent44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d (diff)
am 44d7989a: am 571c5a26: Merge "Fix UB in ResourceTable::stringToInt."
* commit '44d7989abfe41ffa2d4a5cfba8c0d2f880ac9b8d': Fix UB in ResourceTable::stringToInt.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions