diff options
author | Adam Cohen <adamcohen@google.com> | 2012-11-08 13:13:30 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 13:13:30 -0800 |
commit | 06b29549fb9819ed763c401ca471c051805fc7b4 (patch) | |
tree | 901b219ff43dfbdffa7a9065d7bf9bc6aa713cbc /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 2b49dd1c6e0bc9e0fee38f4bdf8889cb791ca81e (diff) | |
parent | 38515e9a4c4c5db5045b873842df594f50b12421 (diff) |
am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
* commit '38515e9a4c4c5db5045b873842df594f50b12421':
Adding user activity when the challenge is slid down
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions