tree bf43874434161c7a751003ef9a5869662d912edc
parent fcf3ed51dc79935d23c1105c792f77ca40c52137
parent 588b770063077aa8dcee35fc44b2676702cf3457
author Elliott Hughes <enh@google.com> 1467997525 +0000
committer android-build-merger <android-build-merger@google.com> 1467997525 +0000

Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
am: 588b770063

Change-Id: I884276a8f8b8209f6e956c5fb410e8265184e1b5