diff options
| author | Justin Ho <justinho@google.com> | 2010-10-25 17:25:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 17:25:02 -0700 |
| commit | 7c7ff8c84f00a1c42380808141bad0f34d81cf64 (patch) | |
| tree | 96996793462df2e68ce7a6aa8920d6ab6aef4ed1 /graphics/java/android/renderscript/Script.java | |
| parent | 63f298a9b1cf373fbcae0ae53d3c268d714fd076 (diff) | |
| parent | 41d21efd61157c9a4c49b2f7a6580ae0cbb58397 (diff) | |
am 41d21efd: (-s ours) am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397'
* commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397':
DO NOT MERGE - Updated ringtone assets for crespo
Diffstat (limited to 'graphics/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions