diff options
author | Varun Shah <varunshah@google.com> | 2020-12-03 02:20:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 02:20:00 +0000 |
commit | 604f55eab9a257c98aea4e071e24364b94f76684 (patch) | |
tree | e47fce7e63e19905278c2f96ff16b297f85a3909 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 47c0e459d8a34e7d56ccc812a35318e387f1a262 (diff) | |
parent | 8f24cb262c80193e9ce7355f4adb7d9a1d8af51e (diff) |
[automerger skipped] RESTRICT AUTOMERGE am: e05538421f am: 28921fe615 -s ours am: 9ab0bce3e8 am: ca804e468c am: 4274fa4dca am: 8f24cb262c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13093516
Change-Id: I44ae42045f2adeed63cb8b1d4b1f56453af2e009
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions