Robert Greenwalt f8361db359 resolved conflicts for merge of 0bff77d6 to master ...

Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01

2014-03-19 12:41:54 -07:00

..

core/java/com/android/server

resolved conflicts for merge of 0bff77d6 to master

2014-03-19 12:41:54 -07:00

tests/servicestests

Update the tests to deal with the new timestamps in idletimer module.

2014-03-18 16:38:58 -07:00