tree 632f70c6e5550030f044a3f13a8e9eceed39e88c
parent 37f6bbeed27189e2cf5fac72c46871aa174a8fb4
parent a565633ff50bdbb355bf3c1a9fed72a39d4514f7
author Stephen Hines <srhines@google.com> 1346909614 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346909614 -0700

am a565633f: Merge "Fix up libbcc for LLVM upstream merge to r162314." into jb-mr1-dev

* commit 'a565633ff50bdbb355bf3c1a9fed72a39d4514f7':
  Fix up libbcc for LLVM upstream merge to r162314.