Ed Heyl 33dd7a4684 Merge "Fix build: Revert "Properly set up local transport data dirs after an initialize operation""

2015-03-13 21:03:07 +00:00

..

java

Merge "Fix build: Revert "Properly set up local transport data dirs after an initialize operation""

2015-03-13 21:03:07 +00:00

jni

am 870110e0: am 30fcd2aa: Merge "Drop unusable SELinux APIs."

2015-03-13 18:26:20 +00: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