OSDN Git Service

Merge "Configurable sampling rate for hidden API access log events." into pi-dev
authorMathew Inwood <mathewi@google.com>
Wed, 11 Apr 2018 17:19:04 +0000 (10:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 17:19:04 +0000 (10:19 -0700)
commitd39b02157b207f09e82cd9453632cddb2df5c8cd
treed8f12610307a6f89ae1a470476477cc742511b2a
parent808582230d9ac37cba5a3bd623264ea06c4f9d1c
parentfb55bd87067fc044056e6f12ee36bd7c8d08cdc5
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
am: fb55bd8706

Change-Id: I734dffcd6c993bf718d6835a734be26de5d76780
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
services/core/java/com/android/server/am/ActivityManagerService.java