diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-07-17 07:20:57 -0700 |
|---|---|---|
| committer | Wale Ogunwale <ogunwale@google.com> | 2015-07-17 07:20:57 -0700 |
| commit | 24b243d53d47ba132588aadf5336f2394c6193fe (patch) | |
| tree | 7b6cb7f34dc56aeb40fd75656bf6095586fb8bf1 /rs/java/android/renderscript/RenderScript.java | |
| parent | e6b407b4be0b9c8240d34259b14e324da4d6832b (diff) | |
Fixed bad merge conflict resolution
https://android-review.googlesource.com/#/c/137534/ was accepted
and merged on 03/04/15. However, a bad merge conflict resolution
caused half of the change to be reverted. This adds back the missing
change.
Change-Id: I4f7c2503e60321b692e12316961958b149baf4ea
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions