diff options
author | Jim Miller <jaggies@google.com> | 2013-11-07 14:57:16 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-07 14:57:16 -0800 |
commit | eaacc7c1ba4ff00bac36f5fbfd7269b04eb77cae (patch) | |
tree | ac522002c422e0f0fbf28b9fe117c33aee5e49bd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 25f6d3e6e0d341239fc9ef56a6310e92bc5f21ce (diff) | |
parent | bb78ae9eedce1136410be326274b5304e8e046dc (diff) |
am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev
* commit 'bb78ae9eedce1136410be326274b5304e8e046dc':
Fix scrubbing behavior on keyguard music transport
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions