tree 352a6a5f8c7802b00f386a3091a655f5c1117dd3
parent 72a6853b9e67f4d2deca42406e97ea4eba949424
parent 053fb9120e850e0e77cb0cbbbe73bed0d56817bc
author Svetoslav Ganov <svetoslavganov@google.com> 1496937857 +0000
committer android-build-merger <android-build-merger@google.com> 1496937857 +0000

Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e

Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8