diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-06 16:20:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 16:20:16 -0700 |
| commit | 52909f1bac03a7699b9cf62d7bbd7ed5e0fa35f5 (patch) | |
| tree | e3e9d09a6d13e259b198d98c08a92c043137eef9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e667e0c73b0857a2811499e68f843fc5619e6433 (diff) | |
| parent | 83176b757765675691d5570e15ad466d60d4f85f (diff) | |
am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit '2a6dc7f19d463c7c9f7aacd12eca5263afd25a90':
Import the Layoutlib from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions