| commit | 94317730392fa32ca2deb1554a08689978a87974 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Apr 12 02:12:34 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 12 02:12:39 2017 +0000 |
| tree | 0dcc331a2341262c7f6aeeceae0d4e68bb4ff2b7 | |
| parent | 3e00a43eb085b136411b5a37d66e4818bd8c2ac2 [diff] | |
| parent | 4508ed51d463b4a1a276d67d76f8d39afda9f557 [diff] |
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