tree a8e32998007fc31fa64c89984f488e266496006b
parent 950a3c010cfbb18bb5974a78040ab9946370e553
parent 047a285d41e3fe0b1a8071ec19f436baf6f187b2
author Elliott Hughes <enh@google.com> 1347664680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347664680 -0700

am 047a285d: Merge "Fix <sys/klog.h> to correspond to the kernel operations."

* commit '047a285d41e3fe0b1a8071ec19f436baf6f187b2':
  Fix <sys/klog.h> to correspond to the kernel operations.