| commit | 67dfcbf17b51cc99898e3265276716a2a061a286 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Fri May 28 15:54:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 28 15:54:27 2010 -0700 |
| tree | 06a049f4d144ed5623ab3af80496b183b47225b7 | |
| parent | 13cf156b85fe9f6a5934d4514aaaebdd5a2a453e [diff] | |
| parent | 59b6dce0d5035b44dd8d99523efc63a469246f42 [diff] |
am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo Merge commit '59b6dce0d5035b44dd8d99523efc63a469246f42' into kraken * commit '59b6dce0d5035b44dd8d99523efc63a469246f42': Added the instrumentation and power log monkey events fro the new power framework.