diff options
| author | Felipe Leme <felipeal@google.com> | 2019-11-11 18:32:46 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-11 18:32:46 -0800 |
| commit | 60a2a3333cca646bd33578b33628d0a7ebc8b147 (patch) | |
| tree | 20856842e4145cea40318ac0238cb4b4db81dd81 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cdc579f8d10f80a1c0220c9bc7fb80c537edcda2 (diff) | |
| parent | 26adde7eb4fc380ceb66026bd0515202619bd176 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users." into qt-qpr1-dev am: 002deeda0c
am: 26adde7eb4 -s ours
am skip reason: subject contains skip directive
Change-Id: I2b47a6f53915902de3602c0375e8366d9655257d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions