tree 78b155f7df060e0b3586b896f1b656165133a5b3
parent 5daf0236fa01e3383e0a1a8449b750d663077cd9
parent 932d50a32ca5e98eb5f5accc820acf8709adc882
author Nan Zhang <nanzhang@google.com> 1538535813 -0700
committer android-build-merger <android-build-merger@google.com> 1538535813 -0700

Merge "Prevent droiddoc from printing running time."
am: 932d50a32c

Change-Id: If2e44787e264e81c37874733075a896c9ef3607b