# HG changeset patch
# User prr
# Date 1501016867 25200
# Node ID c9ac54d4acb45a394df630724f20714c8878e4c2
# Parent  4bb50c0eb53f5a9eafccd48639a03729e07b9ed9# Parent  d05d9a1f82a075a0ed2a546cfbf2bfe5eb457f05
Merge

diff -r d05d9a1f82a0 -r c9ac54d4acb4 make/CompileJavaModules.gmk