diff options
author | Michael Kwan <mkwan@google.com> | 2017-01-10 01:57:33 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-10 01:57:33 +0000 |
commit | c026326cb2b24d36b2a6bb85a4f07b18c5637326 (patch) | |
tree | 97e3fbbd16cb021844fa4f6c809216edb0f1599d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c2cfc69960aca002c9df40bf902936b1adae012e (diff) | |
parent | 636fc0d54c1d83b1f889d69ea6dd11aa96033c38 (diff) |
Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e01 am: 4ebbea26cc" into nyc-mr2-dev-plus-aosp
am: 636fc0d54c
Change-Id: Ia126f71f274f31b0d43086277199d7fcf55aa6f8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions