Ian Pedowitz a371084e29 resolved conflicts for merge of d4b8064e to master ...

Change-Id: I3d41b5bd0ecdd97f8e563b061fc8648d2206bc31

2015-08-03 23:38:43 -07:00

..

current.txt

resolved conflicts for merge of d4b8064e to master

2015-08-03 23:38:43 -07:00

removed.txt

Un-remove legacy ConnectivityManager API.

2015-07-28 11:41:31 -07:00

system-current.txt

resolved conflicts for merge of d4b8064e to master

2015-08-03 23:38:43 -07:00

system-removed.txt

Un-remove legacy ConnectivityManager API.

2015-07-28 11:41:31 -07:00