OSDN Git Service

Merge "Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DI...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 12 Apr 2017 02:12:34 +0000 (02:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 02:12:39 +0000 (02:12 +0000)

Trivial merge