summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2011-11-09 19:34:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-09 19:34:44 +0000
commit77c7b4ddebd20006be2d30b7906ac67efc4dc207 (patch)
tree2a1da11d932b341d2069eb17829cdb40ceb7639b /graphics/java/android/renderscript/RenderScript.java
parentd9514738593ff2e96dcdeff98516c57bab09e9bf (diff)
parentb9b08257370d244b4bccc4e243dda3c4daf4b0af (diff)
am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af': Showing a congratulations screen after choosing face unlock backup lock
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions