diff options
| author | Michael Kwan <mkwan@google.com> | 2017-01-10 01:53:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-10 01:53:19 +0000 |
| commit | 30ecdc2a3f4323e836679cff2c4a3ce3899f9d1c (patch) | |
| tree | 97e3fbbd16cb021844fa4f6c809216edb0f1599d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 47d0126018d23311e51abb7324a46858b77ba3f1 (diff) | |
| parent | 97efbc128fa1e3c09197b3cf9bd91d4bd432b9d0 (diff) | |
Merge "Check if the activity translucency was converted before converted back. am: 39dd370d8e am: fe9e68a63c" into nyc-mr2-dev-plus-aosp
am: 97efbc128f
Change-Id: Ib974a49f3b8a829153322fb1e04d185c0180da8e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions