tree 4cb31f6421f093632ff84c969a34f84fffc42af2
parent 9c57325093e1d96ed6489bcec6d5d324e53241a1
parent cc2ca23b1e928857b371407ecb812e887680b1e2
author Yoshisato Yanagisawa <yyanagisawa@google.com> 1497512319 +0000
committer android-build-merger <android-build-merger@google.com> 1497512319 +0000

Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f
am: cc2ca23b1e

Change-Id: Ie7288bc85507008efeed8bf5a3b42ceb2392062b