OSDN Git Service

Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permissi...
authorJulius D'souza <jdsouza@google.com>
Fri, 26 May 2017 22:05:44 +0000 (22:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 22:05:44 +0000 (22:05 +0000)
am: f4abac4d8f  -s ours

Change-Id: I71478993576ea4d7fb58ceec7eb5a7bc63b425a0


Trivial merge