tree 42ace96c6f5df709233c65760e572b223e65ef1d
parent fc9e525fe07846c1efa23235a59575f8dad69c53
parent 918e6a730cd059392ee6d8b5c5a0f5fa0e5bbd93
author The Android Open Source Project <initial-contribution@android.com> 1337182453 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337182453 -0700

am 918e6a73: Reconcile with jb-release nakasi-factoryrom-release

* commit '918e6a730cd059392ee6d8b5c5a0f5fa0e5bbd93':
  Revert "linker: remove STB_LOCAL hack"
  Revert "Reference __dso_handle in PIC way"
  Revert "Use the new NativeDaemonConnector style."
  libc: Add __aeabi_llsl and __aeabi_llsr to libgcc_compat