OSDN Git Service

Merge changes I1a544a8d,Ie78d3fb0
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 24 Oct 2016 14:45:42 +0000 (14:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Oct 2016 14:45:46 +0000 (14:45 +0000)
commit03db8e4b58342d5ada64f29b049cf30da0ba9369
tree4defff7ebaaa8e3faf8c503ef00c16d3892c4066
parent4e5278165bdb4fb73dd3040ee13b4ecc8a490a0d
parente1c173d2240a8eedf7685c9371087dc047a6931f
Merge changes I1a544a8d,Ie78d3fb0

* changes:
  IpConnectivityMetrics: rate limit ApfProgramEvents
  IpConnectivityMetrics reads buffer size in settings
core/java/android/provider/Settings.java
services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java