| commit | b5dec27eabf35d397de352fc9724e0b84182c045 | [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 | e36e44198b2ff30951d979618624f4f458a48097 | |
| parent | 85a53c098461adaeaadc4cd41c1f0e81b332fcfe [diff] | |
| parent | 43200076621d69c62289f176c704cac05f4065ff [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.