Etan Cohen 856f4a7d05 Merge commit '60df4aa' into merge2 ...

Change-Id: I116a9dbf19e95651a7c50393e4dcd7fb59ca3f3f

2015-04-24 13:58:45 -07:00

..

core/java/com/android/server

Merge commit '60df4aa' into merge2

2015-04-24 13:58:45 -07:00

tests/servicestests

CONNECTIVITY_ACTION is the new _IMMEDIATE

2015-04-20 16:11:58 +09:00