diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-10-04 08:40:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 08:40:18 -0700 |
| commit | c0ed31d7a9f6d6b788635429c20d0f6fa47418de (patch) | |
| tree | 89b9d1f34e4ccbba4ef98dfea8f3f8911dcc8b3d /libs/rs/rsScriptC_LibGL.cpp | |
| parent | 6d95c0d941fa0d9ea50b74e60baf82956a4d4452 (diff) | |
| parent | 07fb33efe8b0cbedf518a8afa20d96d8d4bab69a (diff) | |
am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a'
* commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a':
Refrain warning when not appropriate. Do not merge
Diffstat (limited to 'libs/rs/rsScriptC_LibGL.cpp')
0 files changed, 0 insertions, 0 deletions