| commit | 0c93d3f8d6d1496ee5c48f818ebc4c0b9368302a | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@google.com> | Mon Sep 27 14:13:46 2010 -0700 |
| committer | Joe Onorato <joeo@google.com> | Mon Sep 27 14:13:46 2010 -0700 |
| tree | a54f4e7df9f004f79abb683ac586ce1a4f63f6d6 | |
| parent | 0d8cb3eaf1076ded5faf91b23a4f3c147e699638 [diff] | |
| parent | 225045812a4384945fd1bb7c9bc0c13b02aa2615 [diff] |
Merge commit 'f9f9e248' into manualmerge Conflicts: packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100