diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-25 09:24:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 09:24:41 -0700 |
| commit | 894549908c05dc7dfbba7cde0aaf152bffe34556 (patch) | |
| tree | c1de301e59289ee9ac3fa95516624c3c03ce507c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c51ff97014a16eae9981b078e6902e9f63249139 (diff) | |
| parent | a6194e9111711a6d3b50baf954e91b3d3bee07ae (diff) | |
am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread
Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf'
* commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
Fixed NdefTag parcelable conversion methods.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions