diff options
author | Pierre-Clément Tosi <ptosi@google.com> | 2023-10-12 11:24:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-12 11:24:51 +0000 |
commit | 413967daf9dab42431f06f0052e25ba6490ac379 (patch) | |
tree | db98a7be834fcb6c72524e8fbb093b1d4630efa9 /util.c | |
parent | 6b0a343f75721fe21659b6faff47758f08e37407 (diff) | |
parent | 260ca43c0542010ccabbd168913003f837945b22 (diff) | |
download | dtc-413967daf9dab42431f06f0052e25ba6490ac379.tar.gz |
Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: dc59b8c5ce am: 15ee7e75ee am: 260ca43c05
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358
Change-Id: I97ea7cbaa3d42e1a186eaf8201d066fdd4709e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -21,7 +21,7 @@ #include "libfdt.h" #include "util.h" -#include "version_non_gen.h" +#include "version_gen.h" char *xstrdup(const char *s) { |