diff options
| author | Patrick Dubroy <dubroy@google.com> | 2010-09-24 17:14:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 17:14:43 -0700 |
| commit | 36b113cbbcf81704612d156e471f6932fe907405 (patch) | |
| tree | 9a699c4fe3d608d8e51454ea1daa99ee33e2e447 /libs/rs/rsScriptC_LibGL.cpp | |
| parent | 086b1e9fc2312ab387643563c7d740d8ff85410e (diff) | |
| parent | a9cf44942b8dbdc5bb00b80725ea15d176ebecc8 (diff) | |
| download | frameworks_base-36b113cbbcf81704612d156e471f6932fe907405.zip frameworks_base-36b113cbbcf81704612d156e471f6932fe907405.tar.gz frameworks_base-36b113cbbcf81704612d156e471f6932fe907405.tar.bz2 | |
am a9cf4494: (-s ours) am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8'
* commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8':
do not merge - Asset update (pass #3)
Diffstat (limited to 'libs/rs/rsScriptC_LibGL.cpp')
0 files changed, 0 insertions, 0 deletions