| commit | 8ec5b83fc8f8aa68805c4d5987f8f75bb28250ca | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Jul 01 21:19:35 2009 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Wed Jul 01 21:19:35 2009 -0700 |
| tree | 8a6b5057325b6cd51ad94903fefc97eda1718c21 | |
| parent | fbc7c1a784b3e9b003feaa9bd39d4283b316308e [diff] | |
| parent | 1dac277f93a80c53a870b8924508dd2af81293de [diff] |
Merge commit '1dac277f' into manualmerge Required rewriting the okay battery broadcast stuff. Conflicts: services/java/com/android/server/status/StatusBarPolicy.java