| commit | 35d857002dcbc24d05a0f9d157ce8ee1927ae235 | [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 | 9602fbbf07ba88afe274e11cb2b91a6d420e3014 | |
| parent | 234e509a67eb32606f3051d21eb3ea25b272d80d [diff] | |
| parent | 8059bcbfa71c8233e616304843d9280f5f1615bb [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.