diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 16:52:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-17 16:52:56 -0800 |
| commit | 7ee427714d4621bd9a0b15364a073aff60ebf20c (patch) | |
| tree | d4a4b94c2188c564f1a75b502f06590ee44b8122 /libs/ui/FramebufferNativeWindow.cpp | |
| parent | 31c5f68d8f4af170415c206753f08fa85aa6b2ff (diff) | |
| parent | f4072fcc14ec44072d31d7beeb4524550bead531 (diff) | |
Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions