| commit | f8649200d432aafd43fea7f70faf90fc4f5c4b3c | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@google.com> | Tue Oct 05 12:37:03 2010 -0400 |
| committer | Joe Onorato <joeo@google.com> | Tue Oct 05 12:37:03 2010 -0400 |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 | |
| parent | 699707956589299e278ecf85176b5d0a02779a73 [diff] | |
| parent | f776da9ac4d8831a71ae94e6af5d15ad22a88f00 [diff] |
manual merge Merge commit '77e42376' into work Conflicts: packages/SystemUI/res/values/colors.xml packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e