diff options
| author | Julia Reynolds <juliacr@google.com> | 2016-06-02 00:23:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 00:23:32 +0000 |
| commit | 9cec41f03a1f8ba7d5a82ec07cc67b06e37d17c1 (patch) | |
| tree | 5511f79b35c47cbcf2070c5e491c589a2712b5f8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6f83f46aaab95590f84ca91b1be1bc8ee7a72adf (diff) | |
| parent | 2ec07c96ef75fdd84b194689de300ffc21ee1f2f (diff) | |
Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: e24e9a0333" into nyc-mr1-dev-plus-aosp
am: 2ec07c96ef
* commit '2ec07c96ef75fdd84b194689de300ffc21ee1f2f':
Only call finish on operations that have started.
Change-Id: I0c7f6965b8264e9928120dffd370f1df0c9ea646
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions