diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 10:19:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-06 10:19:51 -0700 |
| commit | 838ffacd2ecf4fbefd8d5a083d91f2949eb47faa (patch) | |
| tree | a9abfa768a8e9e84d44758c5b105932a87ff5130 /libs/rs/rsScriptC_Lib.cpp | |
| parent | d435182ea9425b853d4132eaacd2029e3c2c919f (diff) | |
| parent | 3efbdf6f253f905c8672108a6329886105edec7c (diff) | |
am 3efbdf6f: (-s ours) Merge change 20267 into donut
Merge commit '3efbdf6f253f905c8672108a6329886105edec7c'
* commit '3efbdf6f253f905c8672108a6329886105edec7c':
Do not merge
Diffstat (limited to 'libs/rs/rsScriptC_Lib.cpp')
0 files changed, 0 insertions, 0 deletions