tree f7a7d89146a96a48d84edff61b8766b4c5eb1f8e
parent 25c67db7d28dc91b77f0670b500841f079077af7
parent 9b996f80a95f48bae153c35bacc0360c004e5258
author Ying Wang <wangying@google.com> 1393030726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393030726 +0000

am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."

* commit '9b996f80a95f48bae153c35bacc0360c004e5258':
  Make -rpath-link work with multilib.