diff options
| author | Dan Egnor <egnor@google.com> | 2010-07-20 14:04:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 14:04:33 -0700 |
| commit | 817379ca661582c71ce457eac9b4026f02ccc84d (patch) | |
| tree | 0c919194c090714877b2c62e25984e00b216d760 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e29d19c0061f82a7199aeb4accc50dad57935048 (diff) | |
| parent | 95127e043be8a6ca2247c621b2bd22ca660da654 (diff) | |
am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp
* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions