diff options
| author | Mark Renouf <mrenouf@google.com> | 2014-10-30 23:07:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-30 23:07:22 +0000 |
| commit | ff2e71830cafe063e876e5a56db0d33a8a5ba679 (patch) | |
| tree | 6c317f05882676fdffa6df9e757891925056ed47 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5298190a30288d29cb9107d89b00411def3e469b (diff) | |
| parent | 7be03da0d4365346934c9d6672526119765d1047 (diff) | |
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev
automerge: 7be03da -s ours
* commit '7be03da0d4365346934c9d6672526119765d1047':
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions