tree a22abf9d7c0fb06669af7b764bbc9220f5618846
parent bd922038b69255caf92f5e18c9ed14dc60a94a83
parent ff04ade5e4135f6f3942ea3ab0ca3f47ffdc3122
author Mark Salyzyn <salyzyn@google.com> 1494292301 +0000
committer android-build-merger <android-build-merger@google.com> 1494292301 +0000

Merge "logd: add "+passcred" for logdw socket" am: cc22a8e5a2 am: 518f054bfd
am: ff04ade5e4

Change-Id: I924893609e80661631c506a41459070823e40b74