diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-04 04:22:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-04 04:22:15 +0000 |
| commit | 84787d76ee878b495a19ce0881bf20224515d9ac (patch) | |
| tree | ab75abbec1de413988317686fc1ac10ead582753 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 14b3195aa5786a8010eb670ebb8e2333f5dc3fc4 (diff) | |
| parent | 6999f07d39bfad3d550fc21f6b6e769d22b11b87 (diff) | |
Merge changes from topic "am-76600349da4e4810be01a0dcf115747a" into rvc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 -s ours am: 432bbbcdf2 -s ours
[automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 -s ours am: e5496f1e73 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions