tree 7a7d816decc6c0056617405a07ed4ee36170c9cd
parent 03a143bcb419b717c789be42e90ea6c5fa3c109f
parent 0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e
author Elliott Hughes <enh@google.com> 1354249784 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354249784 -0800

am 0d439d3d: Merge "Remove a bionic workaround."

* commit '0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e':
  Remove a bionic workaround.