# HG changeset patch
# User prr
# Date 1501184209 25200
# Node ID e4003d3dc465a5cf33ae63ce9c55ad973be52781
# Parent  c9ac54d4acb45a394df630724f20714c8878e4c2# Parent  38f385381e541677ae0c0e0c7fb165e33d72698d
Merge

diff -r 38f385381e54 -r e4003d3dc465 make/CompileJavaModules.gmk