diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2009-11-16 14:55:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-16 14:55:37 -0800 |
| commit | 35d857002dcbc24d05a0f9d157ce8ee1927ae235 (patch) | |
| tree | 9602fbbf07ba88afe274e11cb2b91a6d420e3014 /opengl/libagl/egl.cpp | |
| parent | 234e509a67eb32606f3051d21eb3ea25b272d80d (diff) | |
| parent | 8059bcbfa71c8233e616304843d9280f5f1615bb (diff) | |
| download | frameworks_base-35d857002dcbc24d05a0f9d157ce8ee1927ae235.zip frameworks_base-35d857002dcbc24d05a0f9d157ce8ee1927ae235.tar.gz frameworks_base-35d857002dcbc24d05a0f9d157ce8ee1927ae235.tar.bz2 | |
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.
Diffstat (limited to 'opengl/libagl/egl.cpp')
0 files changed, 0 insertions, 0 deletions