tree d00e769d7ba77b0606a7843975689e6a7a46e89d
parent bd23db7a9637065d6a212330aa342541f66c3476
parent 95774c447188319ed022481396b24e00f1e49fca
author Arthur Eubanks <aeubanks@google.com> 1500081157 +0000
committer android-build-merger <android-build-merger@google.com> 1500081157 +0000

Merge "Fix documentation on log file flags" am: a0a0867107 am: fa28078c11
am: 95774c4471

Change-Id: Icd1e82116546e9d18e5c4a8f454f8efd00e34fec