commit | c1353d74a16100d8a20abee7530782fd97567ee9 | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@google.com> | Fri Feb 10 13:07:41 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 13:07:41 2012 -0800 |
tree | dc504a10d927a56996c109b668d948fd682acb10 | |
parent | 6f3c79f1cc141f0320540daa9d12779b8068cf74 [diff] | |
parent | aab002bdd4b86a6564d1a5fb4d6b8c6958eaf104 [diff] |
am aab002bd: Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce * commit 'aab002bdd4b86a6564d1a5fb4d6b8c6958eaf104': 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