diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 15:22:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:22:04 -0700 |
| commit | 1e1a030b502acae11dbd11d826d389351910a60f (patch) | |
| tree | 312d3e682bffec4ea6c960cdd1bc02a436002154 /graphics/java/android/renderscript/RenderScript.java | |
| parent | ae087369c56a270c33c1c1af5be7d3c5d7f94e80 (diff) | |
| parent | 47471175c9d19a00d06a77aa316dcda08be97deb (diff) | |
am 47471175: Can\'t have two rules building the stubs and public.xml!
Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp
* commit '47471175c9d19a00d06a77aa316dcda08be97deb':
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