diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-24 18:10:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 18:10:18 -0700 |
| commit | 960099572d97df03786927974e760070fca3e1ef (patch) | |
| tree | fa1d229e63b369a2f3c5f923870af338eb26b759 /graphics/java/android/renderscript/RenderScript.java | |
| parent | d66a3fe1710eb2c19896c299c812fa0d8bd175b3 (diff) | |
| parent | c388844d50a67ecd8eb93d29d618bae1fa3a3c5d (diff) | |
am c388844d: (-s ours) am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d'
* commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d':
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