diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 15:29:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:29:24 -0700 |
| commit | 522ea25f2be384fd027ce2f644ee647fd8d80634 (patch) | |
| tree | 7245a4c6e658dba0777f805f4a3da6e271f58e2c /graphics/java/android/renderscript/RenderScript.java | |
| parent | e1cc0ffe54a7e961276d43e70988e69222907957 (diff) | |
| parent | 1e1a030b502acae11dbd11d826d389351910a60f (diff) | |
am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public.xml!
Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'
* commit '1e1a030b502acae11dbd11d826d389351910a60f':
Can't have two rules building the stubs and public.xml!
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions