diff options
author | Jamie Gennis <jgennis@google.com> | 2013-04-09 15:39:55 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-09 15:39:55 -0700 |
commit | 097fc7ef72ea8a005028d7315ca7cca2f1aa1972 (patch) | |
tree | f929f4ebaf1c0ce6488a2bb499e38f361ab5256c /graphics/java/android/renderscript/RenderScript.java | |
parent | 6c825d49b77b1b257b59a30c24792d1bf0f5df84 (diff) | |
parent | bb2e031ace9072a0bd71f6316269f3060f04aa27 (diff) |
am bb2e031a: am 65b08486: Merge "Add APIs for application-generated systrace events" into jb-mr2-dev
* commit 'bb2e031ace9072a0bd71f6316269f3060f04aa27':
Add APIs for application-generated systrace events
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions