diff options
author | Sascha Prueter <saschap@google.com> | 2012-11-06 17:14:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-06 17:14:35 -0800 |
commit | bc69698c8f1fdf7abc9ffb0225e47633617f5628 (patch) | |
tree | 1c65beb16392582f70b90e3aac4a844fe9399616 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 51117262c8fadb6d227d137e83ad66996b013141 (diff) | |
parent | 872965bb22ba74a06b755547883c5d0de62bb956 (diff) |
am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '872965bb22ba74a06b755547883c5d0de62bb956':
Use a consistent policy for filtering wake keys.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions