tree b3ef840368405f2464835e406c841b4c394b517c
parent 34488f74ecab310285c1b99087d8aa3128c9b167
parent 4daa516fe79cca3a6230f3534678dc2fa7489138
author Bob Badour <bbadour@google.com> 1591650998 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591650998 +0000

Merge "Add license type: BSD+Apache2+MMIT = NOTICE license am: ff61c416b7 am: 4aefaf749a am: 1053732957 am: 4007ab5cc8 am: e1da0c6ae2" into rvc-dev am: 086876f471 am: 6ac57ccb94 am: 4daa516fe7

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/deqp-deps/glslang/+/11322589

Change-Id: I2db291c8b1241db9de8208ef1302c1ce86199dc3