OSDN Git Service

Merge "Use NetworkStatsService to get stats for apps" am: 693d8a2ab1 am: fa7f4015fc
authorChenbo Feng <fengc@google.com>
Thu, 21 Dec 2017 19:49:25 +0000 (19:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 19:49:25 +0000 (19:49 +0000)
commit71436b32e9d9594b5548ed7154a89d841d22cbc3
tree4c4b1c2b592e95558e41973c6f8c93c0e6ae55b2
parent7ac84ce422bdc94ad0c92225cf2480e3311be3fd
parent09a81e4da177cb59707146a5595cd62b7e78e98d
Merge "Use NetworkStatsService to get stats for apps" am: 693d8a2ab1 am: fa7f4015fc
am: 09a81e4da1

Change-Id: I90ce68a72afbf596e28d987e925795709d24dd52
core/jni/Android.bp
core/jni/AndroidRuntime.cpp
services/core/jni/Android.bp
services/core/jni/onload.cpp