| commit | 43200076621d69c62289f176c704cac05f4065ff | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Nov 16 14:55:37 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 16 14:55:37 2009 -0800 |
| tree | 8a56c1658962b7b519185e36276f3735e0eff8df | |
| parent | 17be9f5c72f604dfdb180351306317c3b1d6bd39 [diff] | |
| parent | 074870af30d89522285788bcfb1faecc42a479b4 [diff] |
am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2 Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp * commit '8059bcbfa71c8233e616304843d9280f5f1615bb': Let RemoteViews nest children, allow ViewFlipper.