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

* commit '0d439d3d744f5ac8b0b0c16dcc9d1d3814ad002e':
  Remove a bionic workaround.
This commit is contained in:
Elliott Hughes 2012-11-29 20:29:44 -08:00 committed by Android Git Automerger
commit dd68dcdb75

Diff Content Not Available