diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-02-10 13:05:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-10 13:05:13 -0800 |
| commit | 6b6c277406cc20db9286fae98006cda2dcd44b97 (patch) | |
| tree | cc601c2c420c5235b4e1526d29509c568f4eb13e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 769e3429a45000997fe553325b7000bf06972d4e (diff) | |
| parent | 48fc5ec69be0f0e841c68d384026b16dfb06c001 (diff) | |
Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
* changes:
Make ActivityManagerService just kill apps when they crash on headless devices.
Add support for disabling wallpaper service
Fix merge problem
Add the ability to pass float extras to AM.
Adding a feature to indicate specific support for Bluetooth API.
SystemServer: Add support for disabling AudioService and MountService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions