OSDN Git Service

Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am:...
authorEugene Susla <eugenesusla@google.com>
Thu, 20 Apr 2017 13:24:59 +0000 (13:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 13:24:59 +0000 (13:24 +0000)
commitc8dbc86216abf18c7e11067618b04b977bcfffff
tree622d2d94f973bcb5dec52339bc59b4383c445648
parent3eccc9b7fe47cb1bee30edc141d200be95384bb5
parent58b0a7d3e988a84811603d50dda4809e0fe5ad65
Merge "Move CompanionDeviceManagerService to a place of its own" into oc-dev am: 992541027b
am: 58b0a7d3e9

Change-Id: Ief8d667257fec6c14f9626b69431545cb47b5575
services/java/com/android/server/SystemServer.java