# HG changeset patch
# User prr
# Date 1504799573 25200
# Node ID 0eeb2c8a2eeb9710ad4ca2cc282f2c74f15946b4
# Parent  1e0d1c3b90592c59d4c8c0d0f1983654a6362396# Parent  c012737819221bf839bd0916f0470a084a8ddc15
Merge

diff -r c01273781922 -r 0eeb2c8a2eeb make/CompileJavaModules.gmk