commit | fc42f828c80a31a529815b46efd863d236da618a | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Tue Nov 17 07:30:18 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 17 07:30:18 2009 -0800 |
tree | 90c8c1e2fba770009b29966b51d7ae27c72b9b71 | |
parent | bb74b6f7d7a7f16dca21aebd366d587a73360629 [diff] | |
parent | 1bd7261d2b595552ac852ca8ed8a5e184bd10b44 [diff] |
am 1bd7261d: am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair Merge commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44' * commit '1bd7261d2b595552ac852ca8ed8a5e184bd10b44': Minor fix for the parent style computation in the layoutlib.