tree c6a919ff4c8702f60f84c78325e937c283f8d6d0
parent b6b386bf91c4e6905dc48ab234bedc8a1a88cb3b
parent 0965552a5ba0ce814bdca590dd2addddfcccbbe1
author Nan Zhang <nanzhang@google.com> 1517957533 +0000
committer android-build-merger <android-build-merger@google.com> 1517957533 +0000

Merge "Add property to enable adding tools.jar to bootclasspath." am: 97754359cc
am: 0965552a5b

Change-Id: I8a93193a79bd4f099621cfd875020f9119d9738f