tree 83047b3b55e91f639134fd8ccafc7988fe55f4f4
parent 4abf62ea9eb7854fecd6ec0e3eb30df838e3debe
parent b69404f3ca7e6b9e5f763ce41b702988723fc221
author Mark Salyzyn <salyzyn@google.com> 1477351410 +0000
committer android-build-merger <android-build-merger@google.com> 1477351410 +0000

Merge "logd: address code fragility in last watermarks" am: dd153ef247 am: 54977be62b am: b00ad4bbb9
am: b69404f3ca

Change-Id: I069aefbfa47a80ba263e587283a3dffafea82814