diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 05:24:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 05:24:54 +0000 |
| commit | 3544db0da929f965204ea9738d7f837d3e6df00a (patch) | |
| tree | 9f7e620f630cbb9d1bbd16defec5d66530e672bb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 87b66386a298fbd9649d38a1423819023a994e92 (diff) | |
| parent | a5e51cb86a98869c5c40c83ae5a12b6755cc3171 (diff) | |
[automerger skipped] Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master am: 5625f26cdc -s ours am: a5e51cb86a -s ours
am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 89667c6bb2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72c6d2936c1d590eb8c42ac62fcf5af8de5df20f
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions