diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-12-20 23:29:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-20 23:29:25 +0000 |
| commit | 7e72f129c6d5734a544c2579477c37765b2af2e7 (patch) | |
| tree | a3f9fc285b2e628d3b5c85bc40d19cee578df1bf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 377749e2f11679f8ebedface34a17252cfeb6217 (diff) | |
| parent | 676cb7fbc8ee86bb47ae63e653c5b0501b39c3cb (diff) | |
Merge changes from topic "am-fa7646cd5bad4de3b7338093290d5061"
* changes:
[automerger skipped] DO NOT MERGE Set ContainerLayer for buffer-less surface am: ff674ee468 -s ours am: 50ac110a5c -s ours am: 418cc09ab6 -s ours
[automerger skipped] Implement construction of container layers am: c1ea10447f am: ef7f39f4f5 am: 049902d9eb -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions