summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-07-16 18:57:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-16 18:57:39 +0000
commit081649c2b5ffc1d9ea7a389cc9687659544a535e (patch)
tree1789f98c8e385e8e0285590bc16172be9b66631b /rs/java/android/renderscript/RenderScript.java
parent8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c (diff)
parentf4db2de881d197db0dfd76645dfd7a95b1f8f0de (diff)
am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de': docs: Added "location" before "gps" in list under "Declaring hardware ..."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions