diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-09-05 22:24:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-05 22:24:16 +0000 |
| commit | 59113c7a51dcda93e2d1cb2217b1b9fc4cd66c89 (patch) | |
| tree | 5b481a7593e8c02733710ad3e4dc12dad606548e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 47a4d99c0cfbd62dda68fc5d06d2cf317f21e9c3 (diff) | |
| parent | f8a7028b23772d82fd2b13d16f9c6e7ac6c6ae19 (diff) | |
Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e skipped: 2e5c1ed2ad
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions