tree bfea06532add95dc1204a80de29a00e18633daf6
parent 11e1ae025f45e47d53f52a839ed659bc8f877fb8
parent 653c78a9099263014fac0cab2ccb60feb70de7a4
author Treehugger Robot <treehugger-gerrit@google.com> 1578518783 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1578518783 +0000

Merge "Define a make variable for merged compat config."