tree 2053b006b29d90260ceb9254ad061cc6ca2f9704
parent 7f7b12b8ebba299868505984d6cf15b11f75aadf
parent 45ddf184960225862c6e178588034cce676683e3
author Elliott Hughes <enh@google.com> 1381426811 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381426811 -0700

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

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