| commit | 4a122c96f3abf0eb20c5b2c3db7cd067f5a919fb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Feb 26 02:07:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 02:07:18 2014 +0000 |
| tree | 51ba9200ec83c55539b3cc2f09e0f54d9305884a | |
| parent | 12c909b20c2a1f8be74914186e54c4143ddc263e [diff] | |
| parent | 9dba192b76ee75c578a62dcef0160fc719a57914 [diff] |
am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64." * commit '9dba192b76ee75c578a62dcef0160fc719a57914': oprofile/daemon doesn't build for x86_64.