tree 41bfbd1f2a857cf2f45573b90a0f64e2536dea1a
parent 65f26a769ac3d3648c533e5e39ba6d1f3f1b3600
parent 9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b
author Ying Wang <wangying@google.com> 1393453869 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393453869 +0000

am 9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."

* commit '9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
  Remove external/tcpdump from 64-bit build blacklist.