diff options
| author | Kenny Root <kroot@google.com> | 2013-04-15 11:26:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 11:26:46 -0700 |
| commit | 986b9a60081c05ef4f1ce09798157ea2b474bc15 (patch) | |
| tree | 8c359f8db17d77a1dfceaca8d51a90d5c8715bd5 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 085e0f1240741f08b36673f4504f398bd65b76eb (diff) | |
| parent | e5ea4bf378ca07b07769e9912a4f0ebbe4f65d8f (diff) | |
am e5ea4bf3: resolved conflicts for merge of caf0496d to jb-mr2-dev-plus-aosp
* commit 'e5ea4bf378ca07b07769e9912a4f0ebbe4f65d8f':
Check outInfo is not null
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions