OSDN Git Service

am 2241d156: am eab6de4e: am 1615a101: am 4a122c96: am 9dba192b: Merge "oprofile...
authorElliott Hughes <enh@google.com>
Mon, 12 May 2014 23:27:43 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:27:43 +0000 (23:27 +0000)
* commit '2241d1564f408594f9162744138114d40a5edc42':


Trivial merge