tree 580d86e30255a6e05d70e3a798ff8a89e6d6897a
parent 5baecee3c6bf348b77b8785bcd8e35362a3507fb
parent 9b8a929dc4375b91dde2e8d34df1b0b485ae3b23
author Elliott Hughes <enh@google.com> 1381426426 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381426426 -0700

am 9b8a929d: Merge "libcutils doesn\'t need to be looking at bionic\'s privates."

* commit '9b8a929dc4375b91dde2e8d34df1b0b485ae3b23':
  libcutils doesn't need to be looking at bionic's privates.