diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 21:09:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 21:09:33 +0000 |
| commit | dee681e81c29ee54eab1ded4fbfa952fc4799965 (patch) | |
| tree | 72ed70b402681c1fbb97b86e64c2b80f37ae8f64 /opengl/java/android/opengl/Material.java | |
| parent | 3250e7416ad401985bf644333160008d50b6fd8e (diff) | |
| parent | a920a2ea1c7fc7eb5674f85c32cd1ee6c716d944 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -s ours am: a920a2ea1c -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358518
Change-Id: Ice79848ca7b7ca055e5c8470ba708de1920835dc
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions