tree a68384621b094eda3b89f829d389ff06c6f7ee9e
parent df0824ad4cd31a3e96653fe82ce969b08cd00be2
parent df8bb0ec52644ac17a91a44744d4ca12b756036b
author Paul Duffin <paulduffin@google.com> 1487858114 +0000
committer android-build-merger <android-build-merger@google.com> 1487858114 +0000

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

Change-Id: If59986dd60ca90836adecdf0cb52f3570bf81f9d