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 | d044f7cdfbe9948ae88a275fe6626d6f58feeaee (patch) | |
tree | dbd3a95a366b2a042c29082c7432962cafc61169 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 879ecd17ab1e9645a9fff994e856fabeb68c8f96 (diff) | |
parent | 2e5c1ed2adf4aa7d57d6178572282e3e07d6a435 (diff) |
Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into nyc-mr2-dev
* changes:
[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