tree 1df3759d221bc0a68a067415e1ad81d4ad241ab1
parent 201320492c5420f2b4b860cf35d9cf50432bc9e1
parent 5da6f4fbd1b76b45e4701ec44f2d1f3a50761f16
author Paul Duffin <paulduffin@google.com> 1487857747 +0000
committer android-build-merger <android-build-merger@google.com> 1487857747 +0000

Merge "Fix build failure when using javac toolchain" am: c098bea921
am: 5da6f4fbd1

Change-Id: I65623ab75b0cc7b828fe67544074549fc21206ca