tree 6ecde30d98bcdf9cc4f50885646f933cb46fb19f
parent dc63372698ce21ab88345ec6ca3792868d2d5eec
parent 842d0140cdeafa335bd7236ae2b3c1a9f314e59f
author Hugo Benichi <hugobenichi@google.com> 1494406168 +0000
committer android-build-merger <android-build-merger@google.com> 1494406168 +0000

Merge "NetworkStatsFactory: fix double accounting on IPv6 only networks" into oc-dev am: f37b271894  -s ours
am: 842d0140cd  -s ours

Change-Id: Ia2b1ca862959fb685e6595f41dbfb130cdad6009