| commit | 66fead422792a4854aab10c22c1428324bf70707 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Jul 27 18:26:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 27 18:26:27 2012 -0700 |
| tree | b2aed9efc8691d214df3d3065fd114d98c8ed10f | |
| parent | 4316da201ddbca5f5c1886b591eed6908e3b6583 [diff] | |
| parent | 006ba8a226236af2189e62a221ae932344b79210 [diff] |
am 006ba8a2: am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev * commit '006ba8a226236af2189e62a221ae932344b79210': Flatten power manager wake lock constants.