diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-11-10 22:50:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 22:50:19 +0000 |
commit | 5a8ce7b2bf6ba9c986f0182de1074468953a967f (patch) | |
tree | a6e9d9a5eb9fa616bfd99044ef1022ac69f0437a /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 56f73a149b38381e7e406defbf492138553013ba (diff) | |
parent | 71ed608ea7cfb349bba06c5f6bb17b525a4fd964 (diff) |
am 71ed608e: am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '71ed608ea7cfb349bba06c5f6bb17b525a4fd964':
Wake on volume key when in dock. Bug: 5580373
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions