diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-10-30 14:24:02 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-10-30 14:24:02 -0700 |
| commit | bce45617083209583d61afbea50994f2cdcda459 (patch) | |
| tree | 6383fcce42736e7aca6189370a555a97cad22780 /include/powermanager | |
| parent | 94e08f40936b6a280f404e8b67cb5ef900747258 (diff) | |
| parent | 2d280f754e32e556407df05d977cfabdfff1c070 (diff) | |
| download | frameworks_base-bce45617083209583d61afbea50994f2cdcda459.zip frameworks_base-bce45617083209583d61afbea50994f2cdcda459.tar.gz frameworks_base-bce45617083209583d61afbea50994f2cdcda459.tar.bz2 | |
resolved conflicts for merge of 2d280f75 to ics-mr1
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
Diffstat (limited to 'include/powermanager')
0 files changed, 0 insertions, 0 deletions