Andreas Gampe 8679a46283 resolved conflicts for merge of b6b9fe21 to master ...

Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

2015-03-13 00:04:10 -07:00

..

java/android/net

resolved conflicts for merge of b6b9fe21 to master

2015-03-13 00:04:10 -07:00

jni

Remove hardcoded include paths.

2014-12-31 10:06:51 +00:00

tests/coretests

NetworkStats to support VPN accounting.

2015-03-09 11:38:10 -07:00