summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-19 05:31:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 05:31:04 +0000
commitaf1fd4e28de6cb39647a52e66887584e3a44991d (patch)
tree4940c61ffac2a10e0ff02be6ea62cbfdd15655f6 /rs/java/android/renderscript/RenderScript.java
parenta3c2ca6140b5a460fbd96618b2065066d8c2ccc8 (diff)
parent7a7f89271e7fc1a6c3c881a1cb56dc88d9958f7a (diff)
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 lmp-docs
* commit '7a7f89271e7fc1a6c3c881a1cb56dc88d9958f7a': 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