diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 16:47:59 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 16:47:59 -0800 |
| commit | f4072fcc14ec44072d31d7beeb4524550bead531 (patch) | |
| tree | e1c9f0667191b0e6098079a9f264b29a32d3f0c2 /libs/ui/FramebufferNativeWindow.cpp | |
| parent | d28dc3cf7738f5574ef6359a67d68820dc6c2ad4 (diff) | |
| parent | 8fc378f9f59c31f4d69878277696c6a6f723af53 (diff) | |
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions