| commit | 36d4d5ce3e73508cf8c6de9a61702816b1fa60ce | [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 | ced08bb77259f4c9fadc00c1f9dab38e9d889994 | |
| parent | cee89ad2c973525121499ef042cef9852323669c [diff] | |
| parent | 1f6696b81dbb6476e2e4e8ca144a19b063da609c [diff] |
Merge commit '1dac277f' into manualmerge Required rewriting the okay battery broadcast stuff. Conflicts: services/java/com/android/server/status/StatusBarPolicy.java