OSDN Git Service

Merge "Ensure only test print services enabled - framework" into oc-dev
authorSvetoslav Ganov <svetoslavganov@google.com>
Thu, 8 Jun 2017 16:04:17 +0000 (16:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 16:04:17 +0000 (16:04 +0000)
commit50859b50a628c1b6f7f2a85959cb2084028c5c08
tree352a6a5f8c7802b00f386a3091a655f5c1117dd3
parent72a6853b9e67f4d2deca42406e97ea4eba949424
parent053fb9120e850e0e77cb0cbbbe73bed0d56817bc
Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e

Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
api/test-current.txt
core/java/android/provider/Settings.java