tree fa96ebcaf8620a3ed806e574d540d63778269674
parent d3ecb3cd05bb135bf7cd4ab4d1572e2fb9745a8a
parent 6ac5660e1c8fc9934d11ed675771063624ac1b4b
author Jean-Baptiste Queru <jbq@google.com> 1287694094 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287694094 -0700

am 6ac5660e: am ade2a929: Merge "bionic: stubs: Make internal symbol static"

Merge commit '6ac5660e1c8fc9934d11ed675771063624ac1b4b'

* commit '6ac5660e1c8fc9934d11ed675771063624ac1b4b':
  bionic: stubs: Make internal symbol static