Jeff Brown 10102e4c0e resolved conflicts for merge of baaa080b to master ...

Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae

2014-02-20 18:05:03 -08:00

..

dreams

Add a new "doze mode" based on Dream components.

2014-02-20 13:39:13 -08:00

notification

Improve error handling in listener services.

2014-02-12 14:31:36 -05:00

textservice

Remove unused imports from frameworks/base.

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

wallpaper

Remove unused imports from frameworks/base.

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