summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Allocation.java
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-06-19 02:08:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-19 02:08:10 +0000
commit80f1fe5f7cc80b6f1da142c782ccbbad45d878a8 (patch)
tree995aab8fd3567fb9b83b1309d23f78be918f1912 /rs/java/android/renderscript/Allocation.java
parent3aa4de11b05599d75af92a15820731144941c38f (diff)
parentf8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc (diff)
am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"
* commit 'f8077cf2d7ee55dbf02ec0c65a05db7e5c2fabfc': Switch from core to core-libart
Diffstat (limited to 'rs/java/android/renderscript/Allocation.java')
0 files changed, 0 insertions, 0 deletions