tree e8941b73b24c7c0941ecdc637fd7e50d5ae35705
parent 02a5c039ffdd476e917c21465c27843000d8fcbb
parent 0bd1a7b4611583ef5ede83120485de2097e0ce38
author Scott Main <smain@google.com> 1498753731 +0000
committer android-build-merger <android-build-merger@google.com> 1498753731 +0000

Merge "Merge "add links to Log class summary for methods and logcat doc" into oc-dev am: ea6fea4d5d" into oc-dr1-dev
am: 0bd1a7b461

Change-Id: I5ebb6c9f860f8a9167ebb460041633db4ab2f160