diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-06 18:11:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 18:11:33 -0700 |
| commit | 1b6c1b73d12c04599f62c007cdc3cfc1dc33260d (patch) | |
| tree | 00a25e32363374782ade1e998b6af138b1f39f45 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8180456e9c96c5cce606e48397928247a000837c (diff) | |
| parent | 52909f1bac03a7699b9cf62d7bbd7ed5e0fa35f5 (diff) | |
am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit 'f6e479993e7c85265692829990ceb3879fbce424':
Import the Layoutlib from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions