diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-11-10 22:42:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 22:42:49 +0000 |
| commit | 71ed608ea7cfb349bba06c5f6bb17b525a4fd964 (patch) | |
| tree | 0e19e5ec349471a2aeb0aee99574ec7d98899a1f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f52df7961f29a2f508fb7421f8cd9c95b9b409aa (diff) | |
| parent | 88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62 (diff) | |
am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
Wake on volume key when in dock. Bug: 5580373
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions