tree 15d2bc5a5e2eb7c26df536149b053a47212b0454
parent af59eec776860514a70443dd94a1bcd130ed0ced
parent 35d09b6928d77d619d95d87f6fe16eaedc99a954
author Mark Salyzyn <salyzyn@google.com> 1429042839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429042839 +0000

am 35d09b69: Merge "logd: pidToUid incorrect"

* commit '35d09b6928d77d619d95d87f6fe16eaedc99a954':
  logd: pidToUid incorrect