tree 23b86d5f6336a292634bb2c9584c386e12c6d38c
parent cdaaba6d6e3e397dbfa6f74a5eaf87ffe2bdbfde
parent 9e3ff8f62fa9376643002c233d03f594fa171167
author Ying Wang <wangying@google.com> 1418763720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418763720 +0000

am 9e3ff8f6: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

* commit '9e3ff8f62fa9376643002c233d03f594fa171167':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.