diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-05 12:37:03 -0400 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2010-10-05 12:37:03 -0400 |
| commit | 066b5c5166c1f5342bd42aa0d68f784a5f4c1dd1 (patch) | |
| tree | 5f8fa1f2065458313c114a7b7e1c4b73ad00ebb6 /core/java/android/widget/AdapterViewFlipper.java | |
| parent | 4243a3a6ed571b17668a3caca7a535508893501f (diff) | |
| parent | 77e42376823197ae7fb3cea2afcca734723174a5 (diff) | |
| download | frameworks_base-066b5c5166c1f5342bd42aa0d68f784a5f4c1dd1.zip frameworks_base-066b5c5166c1f5342bd42aa0d68f784a5f4c1dd1.tar.gz frameworks_base-066b5c5166c1f5342bd42aa0d68f784a5f4c1dd1.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/widget/AdapterViewFlipper.java')
0 files changed, 0 insertions, 0 deletions