summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-19 05:38:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 05:38:41 +0000
commit635d302a9dc3028b40b893229fbbd2b48c153bc0 (patch)
tree2620710f5b89f9cd7e70cc2039d51fe51391a725 /rs/java/android/renderscript/RenderScript.java
parente6bd00f399759625ee41b046659b1f1eb67372f7 (diff)
parentaf1fd4e28de6cb39647a52e66887584e3a44991d (diff)
am af1fd4e2: am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lm
* commit 'af1fd4e28de6cb39647a52e66887584e3a44991d': Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions