diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 21:09:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 21:09:58 +0000 |
| commit | 0f499192c531cb76f82da0e43949a1f68ce2d9f4 (patch) | |
| tree | 72ed70b402681c1fbb97b86e64c2b80f37ae8f64 /opengl/java/android/opengl/Material.java | |
| parent | 1f3707af94555deaeb136f6273c089030d62690c (diff) | |
| parent | f6b9251fbcb6e956cb10b15e573fd75914cda86b (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours am: f6b9251fbc -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519
Change-Id: Id7917b561dc3cc2425ba7f49da85114e3df95e88
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions