Jeff Brown 4e5c089ef3 resolved conflicts for merge of 337e764d to master ...

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26

2014-04-11 01:33:20 -07:00

..

dreams

Plumb display power state through display manager.

2014-04-10 20:46:14 -07:00

notification

Pipe notifications from related users to listeners.

2014-04-08 18:38:38 +01:00

textservice

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

trust

Define initial trust agent API

2014-03-31 20:40:49 +02:00

wallpaper

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00