tree 3334264f208f42ad3ac5df8e086a67da4d4b5849
parent ae2b63a6c722c225ab2bb34849e81b9888ad4cac
parent 1a35a586904cd429fd3a6a6c2de64a16ccdf693d
author Doug Zongker <dougz@google.com> 1408103534 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408103534 +0000

am 1a35a586: revert uncrypt back to dynamic linking, fix libs

* commit '1a35a586904cd429fd3a6a6c2de64a16ccdf693d':
  revert uncrypt back to dynamic linking, fix libs