diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-24 18:05:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 18:05:14 -0700 |
| commit | c388844d50a67ecd8eb93d29d618bae1fa3a3c5d (patch) | |
| tree | ab2fa99951b90dfc3f73a5c9ff1eccb00a6ea747 /graphics/java/android/renderscript/RenderScript.java | |
| parent | a9cf44942b8dbdc5bb00b80725ea15d176ebecc8 (diff) | |
| parent | 234e42df5fac958ed9f15aae6005dd72e4bdf08a (diff) | |
am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp
* commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a':
DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions