Craig Mautner ff288f7f57 resolved conflicts for merge of b7bba718 to master ...

Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac

2013-12-19 10:55:17 -08:00

..

am

DO NOT MERGE: Eliminate StackBox.

2013-12-19 10:51:23 -08:00

app_process

revert ADDR_COMPAT_LAYOUT workaround.

2013-09-18 14:29:46 -07:00

backup

Removing from userdebug builds by default.

2013-03-07 17:28:37 -08:00

bmgr

Harden against transiently unavailable backup transports

2013-11-19 11:24:46 -08:00

bootanimation

am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

2013-12-16 18:47:03 +00:00

bu

DO NOT MERGE - Full backup/restore now handles OBBs sensibly

2013-03-08 15:08:10 -08:00

content

…

ime

…

input

Fix check for default source in input command

2013-08-22 15:01:15 -07:00

interrupter

…

media

Also rely on enabled notification listeners for RemoteController registration

2013-10-04 17:50:44 -07:00

pm

Single-user restrictions

2013-06-25 16:03:55 -07:00

requestsync

…

screencap

get rid of HAL pixelformats 5551 and 4444

2013-07-26 14:58:00 -07:00

settings

…

svc

add reboot and shutdown to svc power command

2013-03-18 18:22:30 -07:00

wm

Have audio service clean up new receivers in crashing processes.

2013-04-08 13:08:37 -07:00