OSDN Git Service

am 83a45f3e: am 14d9b4f1: Perfprofd: various changes related to config parameters.
authorThan McIntosh <thanm@google.com>
Thu, 28 May 2015 17:39:32 +0000 (17:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 17:39:32 +0000 (17:39 +0000)
* commit '83a45f3e342ee0d4e525bf6b2a8af4b618d90fc8':
  Perfprofd: various changes related to config parameters.


Trivial merge