Andreas Gampe db64454b33 resolved conflicts for merge of b6b9fe21 to master ...

Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

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

..

java

resolved conflicts for merge of b6b9fe21 to master

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

jni

Don't allow clients to add FDs to Looper without callbacks.

2015-03-12 19:44:49 -07:00

res

am 276d1bc9: am a98c21a6: Make circular mask thickness configurable

2015-03-12 20:31:52 +00:00

tests

Merge "NetworkStats to support VPN accounting."

2015-03-12 22:10:56 +00:00