diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-07 23:58:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 23:58:15 +0000 |
| commit | 8e5bf1817e603e2c8343ee0a6f270409a2303d54 (patch) | |
| tree | cbbccfafe32ca337b6be4f9c85e5897d26c3e91c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 515a8406aa649fb5ea63a79f697eb04afadf4a3d (diff) | |
| parent | 0f7b02733d870d364bcc8f61eed572aa5e075f5a (diff) | |
am 0f7b0273: am 38586bff: Merge "Fix bug that prevented waking from dream" into mnc-dev
* commit '0f7b02733d870d364bcc8f61eed572aa5e075f5a':
Fix bug that prevented waking from dream
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions