tree 9b18b339106f894734697168f82901ad0ada90b7
parent 7ec1ba3ed7735160786c7f4fa95accdd1dc5f5bf
parent 87b654ce467934ab6a0fe1546341e4db42b5c344
author Dmitriy Ivanov <dimitry@google.com> 1404327259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404327259 +0000

am 87b654ce: Merge "Disable local/protected symbol test for lp64"

* commit '87b654ce467934ab6a0fe1546341e4db42b5c344':
  Disable local/protected symbol test for lp64