| commit | 04b963ad7c43e98760ddb57f703255b8a8caab59 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Tue Nov 17 07:32:55 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 17 07:32:55 2009 -0800 |
| tree | 2b69f31b277ee04d64276e5155f97145a0214313 | |
| parent | 41301259fb0a6bc0aa9da861e876c18d3bf719c4 [diff] | |
| parent | 35d857002dcbc24d05a0f9d157ce8ee1927ae235 [diff] |
am 35d85700: am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2 Merge commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235' * commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235': Let RemoteViews nest children, allow ViewFlipper.