| commit | ce970403d80c77836fd7170bef92f72d3876e74f | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Tue Jun 01 16:08:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 01 16:08:42 2010 -0700 |
| tree | dea455dcbfd963263fe67804e9aa9011f2b42f16 | |
| parent | 3ab6c0ca42652834ecf59e9b0853c20022618774 [diff] | |
| parent | 67dfcbf17b51cc99898e3265276716a2a061a286 [diff] |
am 67dfcbf1: am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo