diff options
author | Rich Slogar <rslogar@google.com> | 2015-04-13 18:43:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-13 18:43:04 +0000 |
commit | 12020cf4418fd5b0918b6df1d6a072be01aac622 (patch) | |
tree | 7d9251f9aa2a716d7a125ced7cc3b3108ef8b4a8 /rs/java/android/renderscript/RenderScript.java | |
parent | 8f68c77cec98a24fd43ad0a5e2d3946d2a16e15e (diff) | |
parent | 3e664c3bda8ee1cb3b2819ba38a8195147ad448a (diff) |
am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs
* commit '3e664c3bda8ee1cb3b2819ba38a8195147ad448a':
docs: systrace update
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions