OSDN Git Service

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

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