Hugo Benichi 2e39aebd6b Merge "Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 am: 164854bde2" into oc-dev-plus-aosp ...

am: b09b85471c

Change-Id: I8b1b20d81efa2d86345b3b15600bed4cd40bb6e8

2017-05-11 14:52:23 +00:00

..

java

Merge "Merge changes Ie762ce75,I611fd791 am: 21a57f263f am: cc9f695ba0 am: 164854bde2" into oc-dev-plus-aosp

2017-05-11 14:52:23 +00:00

res/raw

NetworkStatsFactory: fix double accounting on IPv6 only networks

2017-05-09 22:46:14 +09:00