| commit | 762d30a31365e5cae9ba7c2802de60a2f8c3513d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sun Mar 29 08:55:27 2009 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Sun Mar 29 08:55:27 2009 -0700 |
| tree | 423e30f251b92dc54a9a0d4b7ab47ca1ea4a8800 | |
| parent | d94755bf33193f50b1a63778788e82b5257f22c2 [diff] | |
| parent | b41349409b75cdc23558241eeb255e4ac4f46222 [diff] |
Merge branch 'open_source' into google_internal Conflicts: core/java/android/widget/TwoLineListItem.java core/res/res/values/public.xml preloaded-classes