tree 8b1c2b4498d39c65cc98da36996425a4674232c5
parent 055f5c5820ece571305956a857f7706f705e2a21
parent a01194d594058c30e52359e92be08dba1b0034eb
author Mark Salyzyn <salyzyn@google.com> 1492555734 +0000
committer android-build-merger <android-build-merger@google.com> 1492555734 +0000

Merge "logd: regression in handling watermark boundary." into oc-dev
am: 79af3c6d6a

Change-Id: Ib5c8303d796958136ee586bbcd63cbbe33e12e59