tree 29e629dd01a2f724a80be91051b295517897941a
parent e7fd499a3323b822bfa87bbc9e7d70cf94d2f9ae
parent 94317730392fa32ca2deb1554a08689978a87974
author Julius D'souza <jdsouza@google.com> 1491963880 +0000
committer android-build-merger <android-build-merger@google.com> 1491963880 +0000

Merge "Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 am: 6717748eff  -s ours" into oc-dev-plus-aosp
am: 9431773039

Change-Id: I6f01161b7d11a65585c8da025932c84d32663c92