diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-07 17:17:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 17:17:11 -0700 |
| commit | fea4102ba822de99b68060244fa7693f38acbecf (patch) | |
| tree | 23f458f7b2bf07089e03934403762efdce4f4e3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 346f28be0b1fb5492afc6a6b743e74c6c8760a5f (diff) | |
| parent | 1b6c1b73d12c04599f62c007cdc3cfc1dc33260d (diff) | |
am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit 'abc838716816107754ab0479242d03807ce79fc2':
Import the Layoutlib from hc-mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions