summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-07-29 22:08:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 22:08:15 +0000
commitf8808db0c107c748ba84b097c97de13ec33fd8fa (patch)
tree9e7003b45b97191b90a80cc8d3cbe7e7b90b29eb /rs/java/android/renderscript/RenderScript.java
parenta43752934f76316b60a839b2526a23e40714bd70 (diff)
parent771d210ab2d0df9d6748eb56e3f7250377df1fc4 (diff)
am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit '771d210ab2d0df9d6748eb56e3f7250377df1fc4': Revert "DO NOT MERGE Enhance local log."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions