Merge "Fix for java home for honeycomb"
authorC.J. Collier <[email protected]>
Fri, 6 May 2016 17:00:58 +0000 (17:00 +0000)
committerGerrit Code Review <[email protected]>
Fri, 6 May 2016 17:00:58 +0000 (17:00 +0000)

Trivial merge