Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo