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 | aab002bdd4b86a6564d1a5fb4d6b8c6958eaf104 (patch) | |
tree | b4a2b3c509c6e2048e3b8c51c812524c92d895b5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ab3ea05d63cb987639d03a0e2a8fdbc8e93c5c25 (diff) | |
parent | 54a4a41a60ea6c32787dcf16522053cd192b90cd (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 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions