diff options
| author | Julius D'souza <jdsouza@google.com> | 2017-04-12 02:01:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 02:01:49 +0000 |
| commit | ed799ef6fbd64fb293ae6b822b8d9214a68a6aa1 (patch) | |
| tree | 2595ddcc581fa8db37742d8123f2a00d2bf4fe86 /rs/java/android/renderscript/ProgramFragment.java | |
| parent | f61985f02ec29ad62a01ad607fcb9a3c65e9bbad (diff) | |
| parent | 3c6d6f53f3d1dc80740c1df94b9a1566f84f8f14 (diff) | |
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3 -s ours
Change-Id: Ic4af1cac3a0929db20eccd0693ec5fad834b0093
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions