diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-05-21 09:53:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-21 09:53:38 +0000 |
| commit | 1d8b17ac6e9c92c79d8e33e4d89b8e75f4a3e347 (patch) | |
| tree | 701506d5d8daff683afde328fb85a455a737f927 /rs/java/android/renderscript/RenderScript.java | |
| parent | d76727637ea7d76d8e4487e509e997a8d0838e18 (diff) | |
| parent | 2db531ee1b3a980ea9ee6c7e72ad6d11983500e2 (diff) | |
am 2db531ee: (-s ours) Merge "[DO NOT MERGE] Allow compilation with Jack."
* commit '2db531ee1b3a980ea9ee6c7e72ad6d11983500e2':
[DO NOT MERGE] Allow compilation with Jack.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions