am 9dba192b: (-s ours) Merge "oprofile/daemon doesn\'t build for x86_64."

* commit '9dba192b76ee75c578a62dcef0160fc719a57914':
  oprofile/daemon doesn't build for x86_64.
This commit is contained in:
Elliott Hughes 2014-03-11 18:07:55 +00:00 committed by Android Git Automerger
commit f0ba6b18a8

Diff content is not available