OSDN Git Service

am 1615a101: am 4a122c96: am 9dba192b: Merge "oprofile/daemon doesn\'t build for...
authorElliott Hughes <enh@google.com>
Wed, 26 Feb 2014 02:15:54 +0000 (02:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 02:15:54 +0000 (02:15 +0000)
* commit '1615a1013e311ca19e999ab7ff2c81ea9d9f4a69':
  oprofile/daemon doesn't build for x86_64.


Trivial merge