| commit | 066b5c5166c1f5342bd42aa0d68f784a5f4c1dd1 | [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 | 5f8fa1f2065458313c114a7b7e1c4b73ad00ebb6 | |
| parent | 4243a3a6ed571b17668a3caca7a535508893501f [diff] | |
| parent | 77e42376823197ae7fb3cea2afcca734723174a5 [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