diff options
author | Bob Badour <bbadour@google.com> | 2021-02-25 21:16:18 +0000 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2021-02-25 21:16:24 +0000 |
commit | e379d7450a51934b6709caabe0ce8dd2523b0f8f (patch) | |
tree | 221954a280fd9c8e68d92063c30440742f27a8e5 | |
parent | 17c4d05d443adf0cd6c2714bf67f4c95ec53d933 (diff) | |
parent | 161a50ba48e44ce95c8d6e68b17896903bb2248c (diff) | |
download | amber-e379d7450a51934b6709caabe0ce8dd2523b0f8f.tar.gz |
resolve merge conflicts of 161a50ba48e44ce95c8d6e68b17896903bb2248c to sc-mainline-prod
Change-Id: I3ab76f02b6be2e766cc5a8c33f6ef38e13cbb321
-rw-r--r-- | Android.bp | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,4 +1,3 @@ - genrule { name: "deqp_amber_gen_vk_wrappers", out: ["vk-wrappers.inc", "vk-wrappers.h"], |