OSDN Git Service

Merge "Limit btsnoop file size (3/9)" into oc-dev
authorAjay Panicker <apanicke@google.com>
Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 May 2017 22:56:21 +0000 (22:56 +0000)
commit4d1fb218f48a5170bfb01d9bc32dda6a7c1d2e80
treec486e86ce2f5c75c83c37088d3a3a48f8f9645f2
parentaf4bfcdb7e55682d441c9723cd3659ece6f7164c
parent4d71437598026627af85c576dd53a4247455b34a
Merge "Limit btsnoop file size (3/9)" into oc-dev
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java