OSDN Git Service

am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the...
authorYu Shan Emily Lau <yslau@google.com>
Fri, 28 May 2010 22:50:23 +0000 (15:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 May 2010 22:50:23 +0000 (15:50 -0700)
Merge commit '39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp

* commit '39d7a7451b7e43dc1d71ac983821e76c88775a81':
  Added the instrumentation and power log monkey events fro the new power framework.


Trivial merge