OSDN Git Service

am 33815ea3: am 50e2e1d1: Merge "Perfprofd: various changes related to config paramet...
authorThan McIntosh <thanm@google.com>
Thu, 28 May 2015 17:39:30 +0000 (17:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 17:39:30 +0000 (17:39 +0000)
* commit '33815ea3f3e9547449345654a5e07ab84d8a04c5':
  Perfprofd: various changes related to config parameters.


Trivial merge